CVS commit: src/doc
Module Name:src Committed By: macallan Date: Sat Sep 5 22:40:33 UTC 2009 Modified Files: src/doc: CHANGES Log Message: mention sunleo To generate a diff of this commit: cvs rdiff -u -r1.1283 -r1.1284 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1283 src/doc/CHANGES:1.1284 --- src/doc/CHANGES:1.1283 Thu Sep 3 16:53:10 2009 +++ src/doc/CHANGES Sat Sep 5 22:40:33 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1283 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1284 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -379,3 +379,5 @@ postfix(1): Import version 2.6.5 [tron 20090831] unzip(1): A libarchive-based unzip frontend, emulating most of infozip's command line. [joerg 20090903] + sunleo(4): imported the xf86-video-sunleo 1.2.0 driver from Xorg + [macallan 20090905]
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: macallan Date: Sat Sep 5 22:38:46 UTC 2009 Modified Files: src/distrib/sets/lists/xserver: md.sparc md.sparc64 Log Message: add files for the sunleo driver To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/xserver/md.sparc cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/xserver/md.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xserver/md.sparc diff -u src/distrib/sets/lists/xserver/md.sparc:1.41 src/distrib/sets/lists/xserver/md.sparc:1.42 --- src/distrib/sets/lists/xserver/md.sparc:1.41 Sun Aug 30 21:27:35 2009 +++ src/distrib/sets/lists/xserver/md.sparc Sat Sep 5 22:38:45 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc,v 1.41 2009/08/30 21:27:35 mrg Exp $ +# $NetBSD: md.sparc,v 1.42 2009/09/05 22:38:45 macallan Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/Xsun -unknown- x11 @@ -322,6 +322,8 @@ ./usr/X11R7/lib/modules/drivers/suncg6_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/sunffb_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/sunffb_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/sunleo_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/sunleo_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/suntcx_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/suntcx_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg @@ -479,6 +481,7 @@ ./usr/X11R7/man/cat4/radeon.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/suncg6.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/sunffb.0-unknown- .cat,xorg +./usr/X11R7/man/cat4/sunleo.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/suntcx.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/void.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/wsfb.0-unknown- .cat,xorg @@ -502,6 +505,7 @@ ./usr/X11R7/man/html4/radeon.html -unknown- html,xorg ./usr/X11R7/man/html4/suncg6.html -unknown- html,xorg ./usr/X11R7/man/html4/sunffb.html -unknown- html,xorg +./usr/X11R7/man/html4/sunleo.html -unknown- html,xorg ./usr/X11R7/man/html4/suntcx.html -unknown- html,xorg ./usr/X11R7/man/html4/void.html-unknown- html,xorg ./usr/X11R7/man/html4/wsfb.html-unknown- html,xorg @@ -525,6 +529,7 @@ ./usr/X11R7/man/man4/radeon.4-unknown- .man,xorg ./usr/X11R7/man/man4/suncg6.4-unknown- .man,xorg ./usr/X11R7/man/man4/sunffb.4-unknown- .man,xorg +./usr/X11R7/man/man4/sunleo.4-unknown- .man,xorg ./usr/X11R7/man/man4/suntcx.4-unknown- .man,xorg ./usr/X11R7/man/man4/void.4-unknown- .man,xorg ./usr/X11R7/man/man4/wsfb.4-unknown- .man,xorg Index: src/distrib/sets/lists/xserver/md.sparc64 diff -u src/distrib/sets/lists/xserver/md.sparc64:1.39 src/distrib/sets/lists/xserver/md.sparc64:1.40 --- src/distrib/sets/lists/xserver/md.sparc64:1.39 Sun Aug 30 21:27:35 2009 +++ src/distrib/sets/lists/xserver/md.sparc64 Sat Sep 5 22:38:45 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.39 2009/08/30 21:27:35 mrg Exp $ x11 +# $NetBSD: md.sparc64,v 1.40 2009/09/05 22:38:45 macallan Exp $ x11 ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/Xsun -unknown- x11 @@ -319,6 +319,8 @@ ./usr/X11R7/lib/modules/drivers/suncg6_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/sunffb_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/sunffb_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/sunleo_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/sunleo_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg @@ -474,6 +476,7 @@ ./usr/X11R7/man/cat4/radeon.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/suncg6.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/sunffb.0-unknown- .cat,xorg +./usr/X11R7/man/cat4/sunleo.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/void.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/wsfb.0-unknown- .cat,xorg ./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg @@ -495,6 +498,7 @@ ./usr/X11R7/man/html4/radeon.html -unknown- html,xorg ./usr/X11R7/man/html4/suncg6.html -unknown- html,xorg ./usr/X11R7/man/html4/sunffb.html -unknown- html,xorg +./usr/X11R7/man/html4/sunleo.html -unknown- html,xorg ./usr/X11R7/man/html4/void.html-unknown- html,xorg ./usr/X11R7/man/html4/wsfb.html-unknown- html,xorg ./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg @@ -516,6 +520,7 @@ ./usr/X11R7/man/man4/radeon.4-unknown- .man,xorg ./usr/X11R7/man/man4/suncg6.4-unknown- .man,xorg ./usr/X11R7/man/man4/sunffb.4-unknown- .man,xorg +./usr/X11R7/man/man4/sunleo.4-unknown- .man,xorg ./usr/X11R7/man/man4/void.4-unknown- .man,xorg ./us
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: macallan
Date: Sat Sep 5 22:35:53 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Added Files:
src/external/mit/xorg/server/drivers/xf86-video-sunleo: Makefile
Log Message:
build the sunleo driver on sparc and sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.31 src/external/mit/xorg/server/drivers/Makefile:1.32
--- src/external/mit/xorg/server/drivers/Makefile:1.31 Thu Aug 27 04:35:57 2009
+++ src/external/mit/xorg/server/drivers/Makefile Sat Sep 5 22:35:53 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2009/08/27 04:35:57 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2009/09/05 22:35:53 macallan Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -40,6 +40,7 @@
xf86-video-radeon \
xf86-video-suncg6 \
xf86-video-sunffb \
+ xf86-video-sunleo \
xf86-video-wsfb
.if ${MACHINE} == "sparc"
SUBDIR+= \
Added files:
Index: src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.1
--- /dev/null Sat Sep 5 22:35:53 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile Sat Sep 5 22:35:53 2009
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2009/09/05 22:35:53 macallan Exp $
+
+DRIVER= xf86-video-sunleo
+DRIVER_NAME= sunleo_drv
+
+SRCS= leo_accel.c leo_checks.c leo_cursor.c leo_driver.c \
+ leo_frect.c leo_frectsp.c leo_fspans.c leo_fspanssp.c \
+ leo_glyph.c
+
+CPPFLAGS+= ${X11FLAGS.DRI}
+
+MAN= sunleo.4
+
+.include "../Makefile.xf86-driver"
CVS commit: [matt-nb5-mips64] src
Module Name:src
Committed By: matt
Date: Sat Sep 5 18:53:58 UTC 2009
Modified Files:
src/libexec/ld.elf_so/arch/mips [matt-nb5-mips64]: Makefile.inc
src/usr.bin/elf2ecoff [matt-nb5-mips64]: Makefile
src/usr.bin/ldd [matt-nb5-mips64]: Makefile
src/usr.bin/ldd/elf64 [matt-nb5-mips64]: Makefile
Log Message:
Fix build problems with CPUFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.15.32.2 -r1.15.32.3 \
src/libexec/ld.elf_so/arch/mips/Makefile.inc
cvs rdiff -u -r1.10.46.2 -r1.10.46.3 src/usr.bin/elf2ecoff/Makefile
cvs rdiff -u -r1.7.52.1.4.1 -r1.7.52.1.4.2 src/usr.bin/ldd/Makefile
cvs rdiff -u -r1.4.2.2.4.1 -r1.4.2.2.4.2 src/usr.bin/ldd/elf64/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/mips/Makefile.inc
diff -u src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.15.32.2 src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.15.32.3
--- src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.15.32.2 Sat Sep 5 03:49:02 2009
+++ src/libexec/ld.elf_so/arch/mips/Makefile.inc Sat Sep 5 18:53:58 2009
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.15.32.2 2009/09/05 03:49:02 matt Exp $
+# $NetBSD: Makefile.inc,v 1.15.32.3 2009/09/05 18:53:58 matt Exp $
SRCS+= rtld_start.S mips_reloc.c
# XXX Should not be in CPPFLAGS!
CPUFLAGS+= -G0
-.if (${CPUFLAGS:M-mabi=64} != "")
+ABI64:= ${CPUFLAGS:M-mabi=64:M-mabi=o64}
+.if !empty(ABI64)
CPPFLAGS+= -DELFSIZE=64
.else
CPPFLAGS+= -DELFSIZE=32
Index: src/usr.bin/elf2ecoff/Makefile
diff -u src/usr.bin/elf2ecoff/Makefile:1.10.46.2 src/usr.bin/elf2ecoff/Makefile:1.10.46.3
--- src/usr.bin/elf2ecoff/Makefile:1.10.46.2 Sat Sep 5 03:48:22 2009
+++ src/usr.bin/elf2ecoff/Makefile Sat Sep 5 18:53:57 2009
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.10.46.2 2009/09/05 03:48:22 matt Exp $
+# $NetBSD: Makefile,v 1.10.46.3 2009/09/05 18:53:57 matt Exp $
# from: @(#)Makefile 5.4 (Berkeley) 5/11/90
.include
+ABI64:= ${CPUFLAGS:M-mabi=64:M-mabi=o64}
# Build ELF to {ecoff, aout} tools on mips, for old bootblocks/PROMs.
.if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
((${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
- ${CPUFLAGS:M-mabi=64} == ""))
+ !defined(HOSTPROG) && empty(ABI64)))
PROG= elf2ecoff
Index: src/usr.bin/ldd/Makefile
diff -u src/usr.bin/ldd/Makefile:1.7.52.1.4.1 src/usr.bin/ldd/Makefile:1.7.52.1.4.2
--- src/usr.bin/ldd/Makefile:1.7.52.1.4.1 Sat Sep 5 03:39:26 2009
+++ src/usr.bin/ldd/Makefile Sat Sep 5 18:53:57 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.52.1.4.1 2009/09/05 03:39:26 matt Exp $
+# $NetBSD: Makefile,v 1.7.52.1.4.2 2009/09/05 18:53:57 matt Exp $
.include # for MKDYNAMICROOT definition
@@ -15,10 +15,13 @@
EXTRA_LIBS+= ${LIB_ELF32DIR}/libldd_elf32.a
.endif
+.if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
+ABI64:= ${CPUFLAGS:M-mabi=64:M-mabi=o64}
+.endif
+
.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
(${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
-((${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el") \
- && ${CPUFLAGS:-mabi=64} != "")
+((${MACHINE_ARCH:Mmips64*} != "") && !empty(ABI64))
LIB_ELF64DIR!= cd ${.CURDIR}/elf64 && ${PRINTOBJDIR}
EXTRA_LIBS+= ${LIB_ELF64DIR}/libldd_elf64.a
CPPFLAGS.ldd.c= -DELFSIZE=64
Index: src/usr.bin/ldd/elf64/Makefile
diff -u src/usr.bin/ldd/elf64/Makefile:1.4.2.2.4.1 src/usr.bin/ldd/elf64/Makefile:1.4.2.2.4.2
--- src/usr.bin/ldd/elf64/Makefile:1.4.2.2.4.1 Sat Sep 5 03:39:26 2009
+++ src/usr.bin/ldd/elf64/Makefile Sat Sep 5 18:53:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.2.2.4.1 2009/09/05 03:39:26 matt Exp $
+# $NetBSD: Makefile,v 1.4.2.2.4.2 2009/09/05 18:53:58 matt Exp $
CPPFLAGS+= -DELFSIZE=64
LIB= ldd_elf64
@@ -9,10 +9,13 @@
LIBISPRIVATE= yes
.PATH: ${.CURDIR}/..
+.if ${MACHINE_ARCH:Mmips64*} != ""
+ABI64:= ${CPUFLAGS:M-mabi=64:M-mabi=o64}
+.endif
+
.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
(${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
-((${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el") \
- && ${CPUFLAGS:M-mabi=64} != "")
+(${MACHINE_ARCH:Mmips64*} != "" && !empty(ABI64))
# XXX we need to make sure that we don't accidentally get the elf32
# XXX versions of these.
CVS commit: [matt-nb5-mips64] src/libexec/ld.elf_so/arch/mips
Module Name:src
Committed By: matt
Date: Sat Sep 5 18:53:13 UTC 2009
Modified Files:
src/libexec/ld.elf_so/arch/mips [matt-nb5-mips64]: mips_reloc.c
Log Message:
Fix some BIG_ENDIAN botches.
To generate a diff of this commit:
cvs rdiff -u -r1.53.10.1 -r1.53.10.2 \
src/libexec/ld.elf_so/arch/mips/mips_reloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/mips/mips_reloc.c
diff -u src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.53.10.1 src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.53.10.2
--- src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.53.10.1 Sat Sep 5 03:34:25 2009
+++ src/libexec/ld.elf_so/arch/mips/mips_reloc.c Sat Sep 5 18:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_reloc.c,v 1.53.10.1 2009/09/05 03:34:25 matt Exp $ */
+/* $NetBSD: mips_reloc.c,v 1.53.10.2 2009/09/05 18:53:13 matt Exp $ */
/*
* Copyright 1997 Michael L. Hitch
@@ -30,7 +30,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: mips_reloc.c,v 1.53.10.1 2009/09/05 03:34:25 matt Exp $");
+__RCSID("$NetBSD: mips_reloc.c,v 1.53.10.2 2009/09/05 18:53:13 matt Exp $");
#endif /* not lint */
#include
@@ -94,7 +94,7 @@
(void)memcpy(&val, where, len);
#endif
#if BYTE_ORDER == BIG_ENDIAN
- (void)memcpy(&(const uint8_t *)(val+1) - len, where, len);
+ (void)memcpy((uint8_t *)((&val)+1) - len, where, len);
#endif
return (len == sizeof(Elf_Sxword)) ? val : (Elf_Sword)val;
}
@@ -116,7 +116,7 @@
(void)memcpy(where, &val, len);
#endif
#if BYTE_ORDER == BIG_ENDIAN
- (void)memcpy(where, &(const uint8_t *)(val+1) - len, len);
+ (void)memcpy(where, (const uint8_t *)((&val)+1) - len, len);
#endif
}
CVS commit: [matt-nb5-mips64] src
Module Name:src
Committed By: matt
Date: Sat Sep 5 18:52:32 UTC 2009
Modified Files:
src/common/lib/libc/arch/mips/atomic [matt-nb5-mips64]: Makefile.inc
membar_ops.S
src/sys/arch/mips/mips [matt-nb5-mips64]: lock_stubs.S
Log Message:
Resolve some conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.8.8.1 -r1.8.8.2 \
src/common/lib/libc/arch/mips/atomic/Makefile.inc
cvs rdiff -u -r1.3.10.1 -r1.3.10.2 \
src/common/lib/libc/arch/mips/atomic/membar_ops.S
cvs rdiff -u -r1.9.18.3 -r1.9.18.4 src/sys/arch/mips/mips/lock_stubs.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/mips/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.8.8.1 src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.8.8.2
--- src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.8.8.1 Sat Sep 5 04:03:42 2009
+++ src/common/lib/libc/arch/mips/atomic/Makefile.inc Sat Sep 5 18:52:32 2009
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile.inc,v 1.8.8.1 2009/09/05 04:03:42 matt Exp $
+# $NetBSD: Makefile.inc,v 1.8.8.2 2009/09/05 18:52:32 matt Exp $
.if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread")
.if ${MACHINE_ARCH:Mmips64*} == ""
-SRCS+= atomic_add_32_cas.c atomic_add_32_nv_cas.c atomic_and_32_cas.c \
- atomic_and_32_nv_cas.c atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \
- atomic_inc_32_cas.c atomic_inc_32_nv_cas.c atomic_or_32_cas.c \
- atomic_or_32_nv_cas.c atomic_swap_32_cas.c atomic_add_64_cas.c \
- atomic_add_64_nv_cas.c atomic_and_64_cas.c atomic_and_64_nv_cas.c \
- atomic_dec_64_cas.c atomic_dec_64_nv_cas.c atomic_inc_64_cas.c \
- atomic_inc_64_nv_cas.c atomic_or_64_cas.c atomic_or_64_nv_cas.c \
+SRCS+= atomic_add_32_cas.c atomic_add_32_nv_cas.c \
+ atomic_and_32_cas.c atomic_and_32_nv_cas.c \
+ atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \
+ atomic_inc_32_cas.c atomic_inc_32_nv_cas.c \
+ atomic_or_32_cas.c atomic_or_32_nv_cas.c \
+ atomic_swap_32_cas.c \
+ atomic_add_64_cas.c atomic_add_64_nv_cas.c \
+ atomic_and_64_cas.c atomic_and_64_nv_cas.c \
+ atomic_dec_64_cas.c atomic_dec_64_nv_cas.c \
+ atomic_inc_64_cas.c atomic_inc_64_nv_cas.c \
+ atomic_or_64_cas.c atomic_or_64_nv_cas.c \
atomic_swap_64_cas.c
CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
@@ -17,21 +21,19 @@
.else
SRCS+= atomic_add.S atomic_dec.S atomic_inc.S
SRCS+= atomic_and.S atomic_or.S
-SRCS+= atomic_cas.S atomic_swap.S
+SRCS+= atomic_swap.S
.endif
+
+SRCS+= membar_ops.S
.endif
+
.if defined(LIB) && (${LIB} == "c" || ${LIB} == "pthread")
.if ${MACHINE_ARCH:Mmips64*} == ""
-SRCS+= membar_ops_nop.c atomic_init_testset.c atomic_cas_up.S
+SRCS+= atomic_init_testset.c atomic_cas_up.S
.else
-SRCS+= membar_ops.S atomic_init_cas.c
+SRCS+= atomic_cas.S atomic_init_cas.c
.endif
.endif
-.if defined(LIB) && (${LIB} == "kern")
-
-SRCS+= membar_ops.S
-
-.endif
Index: src/common/lib/libc/arch/mips/atomic/membar_ops.S
diff -u src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.3.10.1 src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.3.10.2
--- src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.3.10.1 Sat Sep 5 04:03:01 2009
+++ src/common/lib/libc/arch/mips/atomic/membar_ops.S Sat Sep 5 18:52:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: membar_ops.S,v 1.3.10.1 2009/09/05 04:03:01 matt Exp $ */
+/* $NetBSD: membar_ops.S,v 1.3.10.2 2009/09/05 18:52:32 matt Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -49,15 +49,23 @@
#define SYNC sync
#endif
-#ifdef SYNC
.text
LEAF(_membar_sync)
- SYNC
j ra
+#ifdef SYNC
+ SYNC
+#else
nop
+#endif
END(_membar_sync)
+#ifdef _KERNEL
+STRONG_ALIAS(mb_read, _membar_sync)
+STRONG_ALIAS(mb_write, _membar_sync)
+STRONG_ALIAS(mb_memory, _membar_sync)
+#endif
+
ATOMIC_OP_ALIAS(membar_sync,_membar_sync)
ATOMIC_OP_ALIAS(membar_enter,_membar_sync)
STRONG_ALIAS(_membar_enter,_membar_sync)
@@ -67,4 +75,3 @@
STRONG_ALIAS(_membar_producer,_membar_sync)
ATOMIC_OP_ALIAS(membar_consumer,_membar_sync)
STRONG_ALIAS(_membar_consumer,_membar_sync)
-#endif /* SYNC */
Index: src/sys/arch/mips/mips/lock_stubs.S
diff -u src/sys/arch/mips/mips/lock_stubs.S:1.9.18.3 src/sys/arch/mips/mips/lock_stubs.S:1.9.18.4
--- src/sys/arch/mips/mips/lock_stubs.S:1.9.18.3 Fri Aug 21 13:04:55 2009
+++ src/sys/arch/mips/mips/lock_stubs.S Sat Sep 5 18:52:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.9.18.3 2009/08/21 13:04:55 uebayasi Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.9.18.4 2009/09/05 18:52:32 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -48,18 +48,8 @@
#else
#define SYNC /* nothing */
#define BDSYNC nop
-#endif /* MIPS_HAS_LLSC != 0 && defined(MULTIPROCESSOR) */
+#endif /* MIPS_HAS_LLSC != 0 && defined(MULTIPROCESSOR) */
-STRONG_ALIAS(mb_read, mb_memory)
-STRONG_ALIAS(mb_write, mb_memory)
-
-/*
- * void mb_memory(void);
- */
-LEAF(mb_memory)
- j ra
- BDSYNC
CVS commit: [matt-nb5-mips64] src
Module Name:src
Committed By: matt
Date: Sat Sep 5 18:46:38 UTC 2009
Modified Files:
src/common/lib/libc/arch/mips/gen [matt-nb5-mips64]: byte_swap_8.S
src/lib/libc/arch/mips/gen [matt-nb5-mips64]: Makefile.inc
src/sys/lib/libkern/arch/mips [matt-nb5-mips64]: Makefile.inc
Log Message:
Add an assmebly version of bswap64
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
src/common/lib/libc/arch/mips/gen/byte_swap_8.S
cvs rdiff -u -r1.28 -r1.28.34.1 src/lib/libc/arch/mips/gen/Makefile.inc
cvs rdiff -u -r1.18.138.1 -r1.18.138.2 \
src/sys/lib/libkern/arch/mips/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/mips/gen/byte_swap_8.S
diff -u src/common/lib/libc/arch/mips/gen/byte_swap_8.S:1.1.2.2 src/common/lib/libc/arch/mips/gen/byte_swap_8.S:1.1.2.3
--- src/common/lib/libc/arch/mips/gen/byte_swap_8.S:1.1.2.2 Sun Aug 30 23:27:35 2009
+++ src/common/lib/libc/arch/mips/gen/byte_swap_8.S Sat Sep 5 18:46:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: byte_swap_8.S,v 1.1.2.2 2009/08/30 23:27:35 matt Exp $ */
+/* $NetBSD: byte_swap_8.S,v 1.1.2.3 2009/09/05 18:46:37 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,20 +35,14 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: byte_swap_8.S,v 1.1.2.2 2009/08/30 23:27:35 matt Exp $")
+ RCSID("$NetBSD: byte_swap_8.S,v 1.1.2.3 2009/09/05 18:46:37 matt Exp $")
#endif /* LIBC_SCCS and not lint */
#undef _LOCORE
#define _LOCORE /* XXX not really, just assembly-code source */
#include
-#if defined(_KERNEL) || defined(_STANDALONE)
-#define BSWAP64_NAME bswap64
-#else
-#define BSWAP64_NAME __bswap64
-#endif
-
-NLEAF(BSWAP64_NAME) # a0 = 0xffeeddccbbaa9988 return 0x8899aabbccddeeff
+NLEAF(bswap64) # a0 = 0xffeeddccbbaa9988 return 0x8899aabbccddeeff
#if (__mips == 32 || __mips == 64) && __mips_isa_rev == 2
#if !defined(__mips_o32)
/*
@@ -121,4 +115,4 @@
or v0, ta1, t1 # v0 = 0xbbaa9988
j ra
#endif /* defined(__mips_o32) */
-END(BSWAP64_NAME)
+END(bswap64)
Index: src/lib/libc/arch/mips/gen/Makefile.inc
diff -u src/lib/libc/arch/mips/gen/Makefile.inc:1.28 src/lib/libc/arch/mips/gen/Makefile.inc:1.28.34.1
--- src/lib/libc/arch/mips/gen/Makefile.inc:1.28 Mon Jul 3 12:58:55 2006
+++ src/lib/libc/arch/mips/gen/Makefile.inc Sat Sep 5 18:46:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2006/07/03 12:58:55 drochner Exp $
+# $NetBSD: Makefile.inc,v 1.28.34.1 2009/09/05 18:46:38 matt Exp $
SRCS+= fabs.S ldexp.S modf.S
@@ -18,7 +18,7 @@
SRCS+= setjmp.S longjmp.c
SRCS+= _setjmp.S
SRCS+= sigsetjmp.S
-SRCS+= byte_swap_2.S byte_swap_4.S bswap64.c
+SRCS+= byte_swap_2.S byte_swap_4.S byte_swap_8.S
SRCS+= makecontext.c resumecontext.c _resumecontext.S swapcontext.S _lwp.c
Index: src/sys/lib/libkern/arch/mips/Makefile.inc
diff -u src/sys/lib/libkern/arch/mips/Makefile.inc:1.18.138.1 src/sys/lib/libkern/arch/mips/Makefile.inc:1.18.138.2
--- src/sys/lib/libkern/arch/mips/Makefile.inc:1.18.138.1 Tue Aug 18 15:27:42 2009
+++ src/sys/lib/libkern/arch/mips/Makefile.inc Sat Sep 5 18:46:38 2009
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.18.138.1 2009/08/18 15:27:42 matt Exp $
+# $NetBSD: Makefile.inc,v 1.18.138.2 2009/09/05 18:46:38 matt Exp $
#
# There are likely more that we will notice when we go native
-SRCS+= __assert.c bswap64.c memchr.c memcmp.c random.c scanc.c \
+SRCS+= __assert.c memchr.c memcmp.c random.c scanc.c \
skpc.c strcat.c strcpy.c strcasecmp.c \
strncasecmp.c strncmp.c strncpy.c strtoul.c
-SRCS+= byte_swap_2.S byte_swap_4.S ffs.S memcpy.S memset2.c memmove.S \
+SRCS+= byte_swap_2.S byte_swap_4.S byte_swap_8.S \
+ ffs.S memcpy.S memset2.c memmove.S \
strlen.S strcmp.S
CVS commit: src/sbin/mount_smbfs
Module Name:src
Committed By: pooka
Date: Sat Sep 5 18:37:51 UTC 2009
Modified Files:
src/sbin/mount_smbfs: Makefile
Log Message:
Include Makefile.inc earlier to make dot.nsmbrc install properly.
Pointed out by gson.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/mount_smbfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount_smbfs/Makefile
diff -u src/sbin/mount_smbfs/Makefile:1.8 src/sbin/mount_smbfs/Makefile:1.9
--- src/sbin/mount_smbfs/Makefile:1.8 Fri Sep 4 18:25:56 2009
+++ src/sbin/mount_smbfs/Makefile Sat Sep 5 18:37:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/09/04 18:25:56 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2009/09/05 18:37:51 pooka Exp $
WARNS?= 3 # XXX: sign-compare issues
@@ -8,12 +8,12 @@
MAN= mount_smbfs.8
SRCS= mount_smbfs.c
+.include "Makefile.inc"
+
.if ${MKSHARE} != "no"
.PATH: ${SMBDIST}/examples
FILESDIR= /usr/share/examples/smbfs
FILES= dot.nsmbrc
.endif
-.include "Makefile.inc"
-
.include
CVS commit: src/sys/arch/arm/xscale
Module Name:src
Committed By: bsh
Date: Sat Sep 5 17:40:35 UTC 2009
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_intr.c
Log Message:
correct the initial value of interrupt masks. 0 is to disable.
This fixes stray interrupt from LCD controller when lcd driver is not
configured in the kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/xscale/pxa2x0_intr.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/arm/xscale/pxa2x0_intr.c
diff -u src/sys/arch/arm/xscale/pxa2x0_intr.c:1.15 src/sys/arch/arm/xscale/pxa2x0_intr.c:1.16
--- src/sys/arch/arm/xscale/pxa2x0_intr.c:1.15 Fri Nov 7 16:14:37 2008
+++ src/sys/arch/arm/xscale/pxa2x0_intr.c Sat Sep 5 17:40:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_intr.c,v 1.15 2008/11/07 16:14:37 rafal Exp $ */
+/* $NetBSD: pxa2x0_intr.c,v 1.16 2009/09/05 17:40:35 bsh Exp $ */
/*
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.15 2008/11/07 16:14:37 rafal Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.16 2009/09/05 17:40:35 bsh Exp $");
#include
#include
@@ -262,25 +262,11 @@
init_interrupt_masks(void)
{
- memset(pxa2x0_imask, 0, sizeof(pxa2x0_imask));
-
- /*
- * IPL_NONE has soft interrupts enabled only, at least until
- * hardware handlers are installed.
- */
- pxa2x0_imask[IPL_NONE] = ~0;
/*
- * Initialize the soft interrupt masks to block themselves.
+ * disable all interrups until handlers are installed.
*/
- pxa2x0_imask[IPL_SOFTCLOCK] = ~0;
- pxa2x0_imask[IPL_SOFTBIO] = ~0;
- pxa2x0_imask[IPL_SOFTNET] = ~0;
- pxa2x0_imask[IPL_SOFTSERIAL] = ~0;
+ memset(pxa2x0_imask, 0, sizeof(pxa2x0_imask));
- pxa2x0_imask[IPL_SOFTCLOCK] &= pxa2x0_imask[IPL_NONE];
- pxa2x0_imask[IPL_SOFTBIO] &= pxa2x0_imask[IPL_SOFTCLOCK];
- pxa2x0_imask[IPL_SOFTNET] &= pxa2x0_imask[IPL_SOFTBIO];
- pxa2x0_imask[IPL_SOFTSERIAL] &= pxa2x0_imask[IPL_SOFTNET];
}
#undef splx
CVS commit: src/etc
Module Name:src
Committed By: apb
Date: Sat Sep 5 16:45:33 UTC 2009
Modified Files:
src/etc: rc.subr
Log Message:
Change multiple spaces to tabs on one line
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/etc/rc.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.subr
diff -u src/etc/rc.subr:1.76 src/etc/rc.subr:1.77
--- src/etc/rc.subr:1.76 Fri Jul 10 20:02:21 2009
+++ src/etc/rc.subr Sat Sep 5 16:45:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.76 2009/07/10 20:02:21 christos Exp $
+# $NetBSD: rc.subr,v 1.77 2009/09/05 16:45:33 apb Exp $
#
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -792,7 +792,7 @@
fi
eval $(eval '(
load_rc_config '$1' >/dev/null;
-if [ -n "${'$2'}" -o "${'$2'-UNSET}" != "UNSET" ]; then
+ if [ -n "${'$2'}" -o "${'$2'-UNSET}" != "UNSET" ]; then
echo '$2'=\'\''${'$2'}\'\'';
fi
)' )
CVS commit: src/etc/rc.d
Module Name:src
Committed By: apb
Date: Sat Sep 5 16:26:07 UTC 2009
Modified Files:
src/etc/rc.d: downinterfaces
Log Message:
* Use functions from rc.subr, and indent the code.
* Add "KEYWORD: nostart", so /etc/rc doesn't try to run this (it would
have been harmless anyway).
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/downinterfaces
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/downinterfaces
diff -u src/etc/rc.d/downinterfaces:1.5 src/etc/rc.d/downinterfaces:1.6
--- src/etc/rc.d/downinterfaces:1.5 Mon Oct 11 15:00:51 2004
+++ src/etc/rc.d/downinterfaces Sat Sep 5 16:26:07 2009
@@ -1,31 +1,37 @@
#!/bin/sh
#
-# $NetBSD: downinterfaces,v 1.5 2004/10/11 15:00:51 christos Exp $
+# $NetBSD: downinterfaces,v 1.6 2009/09/05 16:26:07 apb Exp $
#
# PROVIDE: downinterfaces
-# KEYWORD: shutdown
+# KEYWORD: nostart shutdown
-if [ "x$1" = "xstop" ]; then
+$_rc_subr_loaded . /etc/rc.subr
-. /etc/rc.conf
-
-tmp=$(ifconfig -lu)
-iflist=""
-for int in $tmp; do
- case $int in
- pppoe*) iflist="$iflist $int"
- ;;
- esac
-done
-iflist="$iflist $force_down_interfaces"
-if [ "$iflist" != "" ] && [ "$iflist" != " " ]
-then
-
- echo "Shutting down interfaces:$iflist"
- for int in $iflist; do
- ifconfig $int down
+name="downinterfaces"
+start_cmd=":"
+stop_cmd="downinterfaces_stop"
+
+downinterfaces_stop()
+{
+ tmp=$(ifconfig -lu)
+ iflist=""
+ for int in $tmp; do
+ case $int in
+ pppoe*) iflist="$iflist $int"
+ ;;
+ esac
done
-fi
+ iflist="$iflist $force_down_interfaces"
+ if [ "$iflist" != "" ] && [ "$iflist" != " " ]
+ then
+
+ echo "Shutting down interfaces:$iflist"
+ for int in $iflist; do
+ ifconfig $int down
+ done
+ fi
+}
-fi
+load_rc_config $name
+run_rc_command "$1"
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sat Sep 5 16:24:20 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Fix a small formatting issue with ticket 914. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.10 src/doc/CHANGES-5.0.2:1.1.2.11 --- src/doc/CHANGES-5.0.2:1.1.2.10 Sat Sep 5 13:18:33 2009 +++ src/doc/CHANGES-5.0.2 Sat Sep 5 16:24:20 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.10 2009/09/05 13:18:33 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.11 2009/09/05 16:24:20 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -198,7 +198,7 @@ sbin/fsck_ext2fs/main.c1.33 Ignore the "-P" option as intended to make this work with e.g. - "fsck_flags=3D-pP" in "/etc/rc.conf". + "fsck_flags=-pP" in "/etc/rc.conf". Patch supplied by Pierre Pronchery in PR bin/41490. [tron, ticket #914]
CVS commit: src/etc/rc.d
Module Name:src
Committed By: apb
Date: Sat Sep 5 16:24:04 UTC 2009
Modified Files:
src/etc/rc.d: bootconf.sh
Log Message:
Use functions from rc.subr.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/etc/rc.d/bootconf.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/bootconf.sh
diff -u src/etc/rc.d/bootconf.sh:1.9 src/etc/rc.d/bootconf.sh:1.10
--- src/etc/rc.d/bootconf.sh:1.9 Sun Apr 23 23:26:26 2006
+++ src/etc/rc.d/bootconf.sh Sat Sep 5 16:24:03 2009
@@ -1,11 +1,17 @@
#!/bin/sh
#
-# $NetBSD: bootconf.sh,v 1.9 2006/04/23 23:26:26 hubertf Exp $
+# $NetBSD: bootconf.sh,v 1.10 2009/09/05 16:24:03 apb Exp $
#
# PROVIDE: bootconf
# REQUIRE: mountcritlocal
+$_rc_subr_loaded . /etc/rc.subr
+
+name="bootconf"
+start_cmd="bootconf_start"
+stop_cmd=":"
+
bootconf_start()
{
# Refer to newbtconf(8) for more information
@@ -60,6 +66,8 @@
fi
done
+ rc_print_metadata "note:Using configuration \"$conf\""
+
case $conf in
current|default)
;;
@@ -74,8 +82,5 @@
fi
}
-case "$1" in
-*start)
- bootconf_start
- ;;
-esac
+load_rc_config $name
+run_rc_command "$1"
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Sat Sep 5 16:23:53 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Fix a small formatting issue with ticket 914. To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.65 src/doc/CHANGES-5.1:1.1.2.66 --- src/doc/CHANGES-5.1:1.1.2.65 Sat Sep 5 13:18:04 2009 +++ src/doc/CHANGES-5.1 Sat Sep 5 16:23:53 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.65 2009/09/05 13:18:04 bouyer Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.66 2009/09/05 16:23:53 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -2338,7 +2338,7 @@ sbin/fsck_ext2fs/main.c1.33 Ignore the "-P" option as intended to make this work with e.g. - "fsck_flags=3D-pP" in "/etc/rc.conf". + "fsck_flags=-pP" in "/etc/rc.conf". Patch supplied by Pierre Pronchery in PR bin/41490. [tron, ticket #914]
CVS commit: src/share/man/man9
Module Name:src Committed By: apb Date: Sat Sep 5 16:13:21 UTC 2009 Modified Files: src/share/man/man9: Makefile Log Message: Sort bzero to the correct position To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/share/man/man9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.290 src/share/man/man9/Makefile:1.291 --- src/share/man/man9/Makefile:1.290 Sat Sep 5 08:55:41 2009 +++ src/share/man/man9/Makefile Sat Sep 5 16:13:21 2009 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.290 2009/09/05 08:55:41 apb Exp $ +# $NetBSD: Makefile,v 1.291 2009/09/05 16:13:21 apb Exp $ # Makefile for section 9 (kernel function and variable) manual pages. MAN= accept_filter.9 accf_data.9 accf_http.9 \ altq.9 arc4random.9 arp.9 audio.9 autoconf.9 \ - bcdtobin.9 bcmp.9 bcopy.9 bluetooth.9 bzero.9 \ - buffercache.9 bufq.9 bus_dma.9 bus_space.9 byteorder.9 \ + bcdtobin.9 bcmp.9 bcopy.9 bluetooth.9 boothowto.9 \ + buffercache.9 bufq.9 bus_dma.9 bus_space.9 byteorder.9 bzero.9 \ callout.9 cardbus.9 cnmagic.9 condvar.9 config.9 cons.9 copy.9 \ coredump_write.9 \ cpu_configure.9 cpu_coredump.9 cpu_dumpconf.9 \
CVS commit: src/sys/dev/cardbus
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 14:50:10 UTC 2009
Modified Files:
src/sys/dev/cardbus: if_ath_cardbus.c if_fxp_cardbus.c if_rtk_cardbus.c
if_rtw_cardbus.c
Log Message:
Invert logic around nested pmf(9) registrations for readability.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/cardbus/if_rtw_cardbus.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/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.33 src/sys/dev/cardbus/if_ath_cardbus.c:1.34
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.33 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/if_ath_cardbus.c Sat Sep 5 14:50:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.34 2009/09/05 14:50:10 tsutsui Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA .
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.34 2009/09/05 14:50:10 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -215,12 +215,12 @@
if (ath_attach(PCI_PRODUCT(ca->ca_id), sc) != 0)
return;
- if (!pmf_device_register(self, ath_cardbus_suspend, ath_cardbus_resume))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else {
+ if (pmf_device_register(self,
+ ath_cardbus_suspend, ath_cardbus_resume)) {
pmf_class_network_register(self, &sc->sc_if);
pmf_device_suspend_self(self);
- }
+ } else
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
int
Index: src/sys/dev/cardbus/if_fxp_cardbus.c
diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.39 src/sys/dev/cardbus/if_fxp_cardbus.c:1.40
--- src/sys/dev/cardbus/if_fxp_cardbus.c:1.39 Tue May 12 14:17:31 2009
+++ src/sys/dev/cardbus/if_fxp_cardbus.c Sat Sep 5 14:50:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.39 2009/05/12 14:17:31 cegger Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.40 2009/09/05 14:50:10 tsutsui Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.39 2009/05/12 14:17:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.40 2009/09/05 14:50:10 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -183,10 +183,10 @@
fxp_attach(sc);
fxp_disable(sc);
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, &sc->sc_ethercom.ec_if);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
static void
Index: src/sys/dev/cardbus/if_rtk_cardbus.c
diff -u src/sys/dev/cardbus/if_rtk_cardbus.c:1.37 src/sys/dev/cardbus/if_rtk_cardbus.c:1.38
--- src/sys/dev/cardbus/if_rtk_cardbus.c:1.37 Tue Jun 24 19:44:52 2008
+++ src/sys/dev/cardbus/if_rtk_cardbus.c Sat Sep 5 14:50:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_cardbus.c,v 1.37 2008/06/24 19:44:52 drochner Exp $ */
+/* $NetBSD: if_rtk_cardbus.c,v 1.38 2009/09/05 14:50:10 tsutsui Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.37 2008/06/24 19:44:52 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.38 2009/09/05 14:50:10 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -246,10 +246,10 @@
rtk_attach(sc);
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, &sc->ethercom.ec_if);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
/*
* Power down the socket.
Index: src/sys/dev/cardbus/if_rtw_cardbus.c
diff -u src/sys/dev/cardbus/if_rtw_cardbus.c:1.29 src/sys/dev/cardbus/if_rtw_cardbus.c:1.30
--- src/sys/dev/cardbus/if_rtw_cardbus.c:1.29 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/if_rtw_cardbus.c Sat Sep 5 14:50:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.30 2009/09/05 14:50:10 tsutsui Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.30 2009/09/05 14:50:10 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -296,15 +296,15 @@
CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 14:44:59 UTC 2009
Modified Files:
src/sys/dev/pcmcia: if_an_pcmcia.c if_ne_pcmcia.c if_ray.c
if_wi_pcmcia.c
Log Message:
Invert logic around nested pmf(9) registrations for readability.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pcmcia/if_an_pcmcia.c
cvs rdiff -u -r1.156 -r1.157 src/sys/dev/pcmcia/if_ne_pcmcia.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pcmcia/if_ray.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/pcmcia/if_wi_pcmcia.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/pcmcia/if_an_pcmcia.c
diff -u src/sys/dev/pcmcia/if_an_pcmcia.c:1.39 src/sys/dev/pcmcia/if_an_pcmcia.c:1.40
--- src/sys/dev/pcmcia/if_an_pcmcia.c:1.39 Tue May 12 14:42:18 2009
+++ src/sys/dev/pcmcia/if_an_pcmcia.c Sat Sep 5 14:44:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pcmcia.c,v 1.39 2009/05/12 14:42:18 cegger Exp $ */
+/* $NetBSD: if_an_pcmcia.c,v 1.40 2009/09/05 14:44:59 tsutsui Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.39 2009/05/12 14:42:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.40 2009/09/05 14:44:59 tsutsui Exp $");
#include
#include
@@ -155,10 +155,10 @@
goto fail2;
}
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, &sc->sc_if);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
an_pcmcia_disable(sc);
sc->sc_enabled = 0;
Index: src/sys/dev/pcmcia/if_ne_pcmcia.c
diff -u src/sys/dev/pcmcia/if_ne_pcmcia.c:1.156 src/sys/dev/pcmcia/if_ne_pcmcia.c:1.157
--- src/sys/dev/pcmcia/if_ne_pcmcia.c:1.156 Sun Apr 5 03:37:07 2009
+++ src/sys/dev/pcmcia/if_ne_pcmcia.c Sat Sep 5 14:44:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pcmcia.c,v 1.156 2009/04/05 03:37:07 uwe Exp $ */
+/* $NetBSD: if_ne_pcmcia.c,v 1.157 2009/09/05 14:44:59 tsutsui Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.156 2009/04/05 03:37:07 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.157 2009/09/05 14:44:59 tsutsui Exp $");
#include
#include
@@ -741,13 +741,12 @@
"WARNING: unable to establish power hook\n");
/* pmf(9) power hooks */
- if (!pmf_device_register(self, ne2000_suspend, ne2000_resume))
- aprint_error_dev(self, "unable to establish power handler\n");
- else {
+ if (pmf_device_register(self, ne2000_suspend, ne2000_resume)) {
#if 0 /* XXX: notyet: if_stop is NULL! */
pmf_class_network_register(self, &dsc->sc_ec.ec_if);
#endif
- }
+ } else
+ aprint_error_dev(self, "unable to establish power handler\n");
psc->sc_state = NE_PCMCIA_ATTACHED;
ne_pcmcia_disable(dsc);
Index: src/sys/dev/pcmcia/if_ray.c
diff -u src/sys/dev/pcmcia/if_ray.c:1.75 src/sys/dev/pcmcia/if_ray.c:1.76
--- src/sys/dev/pcmcia/if_ray.c:1.75 Tue May 12 14:42:18 2009
+++ src/sys/dev/pcmcia/if_ray.c Sat Sep 5 14:44:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.75 2009/05/12 14:42:18 cegger Exp $ */
+/* $NetBSD: if_ray.c,v 1.76 2009/09/05 14:44:59 tsutsui Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.75 2009/05/12 14:42:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.76 2009/09/05 14:44:59 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -602,10 +602,10 @@
else
ifmedia_set(&sc->sc_media, IFM_INFRA);
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, ifp);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
/* The attach is successful. */
sc->sc_attached = 1;
Index: src/sys/dev/pcmcia/if_wi_pcmcia.c
diff -u src/sys/dev/pcmcia/if_wi_pcmcia.c:1.84 src/sys/dev/pcmcia/if_wi_pcmcia.c:1.85
--- src/sys/dev/pcmcia/if_wi_pcmcia.c:1.84 Tue May 12 14:42:18 2009
+++ src/sys/dev/pcmcia/if_wi_pcmcia.c Sat Sep 5 14:44:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.84 2009/05/12 14:42:18 cegger Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.85 2009/09/05 14:44:59 tsutsui Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.84 2009/05/12 14:42:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.85 2009/09/05 14:44:59 tsutsui Exp $");
#include
#include
@@ -376,10 +376,10 @@
goto fail2;
}
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power ha
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 14:19:30 UTC 2009
Modified Files:
src/sys/dev/ic: atw.c elinkxl.c rt2560.c rt2661.c tulip.c
Log Message:
Invert logic around nested pmf(9) registrations for readability.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/dev/ic/atw.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/rt2560.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/rt2661.c
cvs rdiff -u -r1.171 -r1.172 src/sys/dev/ic/tulip.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/ic/atw.c
diff -u src/sys/dev/ic/atw.c:1.143 src/sys/dev/ic/atw.c:1.144
--- src/sys/dev/ic/atw.c:1.143 Tue May 26 23:57:34 2009
+++ src/sys/dev/ic/atw.c Sat Sep 5 14:19:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atw.c,v 1.143 2009/05/26 23:57:34 dyoung Exp $ */
+/* $NetBSD: atw.c,v 1.144 2009/09/05 14:19:30 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.143 2009/05/26 23:57:34 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.144 2009/09/05 14:19:30 tsutsui Exp $");
#include "bpfilter.h"
@@ -858,11 +858,11 @@
sizeof(struct ieee80211_frame) + 64, &sc->sc_radiobpf);
#endif
- if (!pmf_device_register1(sc->sc_dev, NULL, NULL, atw_shutdown)) {
+ if (pmf_device_register1(sc->sc_dev, NULL, NULL, atw_shutdown))
+ pmf_class_network_register(sc->sc_dev, &sc->sc_if);
+ else
aprint_error_dev(sc->sc_dev,
"couldn't establish power handler\n");
- } else
- pmf_class_network_register(sc->sc_dev, &sc->sc_if);
memset(&sc->sc_rxtapu, 0, sizeof(sc->sc_rxtapu));
sc->sc_rxtap.ar_ihdr.it_len = htole16(sizeof(sc->sc_rxtapu));
Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.107 src/sys/dev/ic/elinkxl.c:1.108
--- src/sys/dev/ic/elinkxl.c:1.107 Wed Dec 3 15:36:11 2008
+++ src/sys/dev/ic/elinkxl.c Sat Sep 5 14:19:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.107 2008/12/03 15:36:11 tsutsui Exp $ */
+/* $NetBSD: elinkxl.c,v 1.108 2009/09/05 14:19:30 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.107 2008/12/03 15:36:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.108 2009/09/05 14:19:30 tsutsui Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -448,10 +448,11 @@
RND_TYPE_NET, 0);
#endif
- if (!pmf_device_register1(sc->sc_dev, NULL, NULL, ex_shutdown))
- aprint_error_dev(sc->sc_dev, "couldn't establish power handler\n");
- else
+ if (pmf_device_register1(sc->sc_dev, NULL, NULL, ex_shutdown))
pmf_class_network_register(sc->sc_dev, &sc->sc_ethercom.ec_if);
+ else
+ aprint_error_dev(sc->sc_dev,
+ "couldn't establish power handler\n");
/* The attach is successful. */
sc->ex_flags |= EX_FLAGS_ATTACHED;
Index: src/sys/dev/ic/rt2560.c
diff -u src/sys/dev/ic/rt2560.c:1.20 src/sys/dev/ic/rt2560.c:1.21
--- src/sys/dev/ic/rt2560.c:1.20 Fri Nov 7 00:20:02 2008
+++ src/sys/dev/ic/rt2560.c Sat Sep 5 14:19:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2560.c,v 1.20 2008/11/07 00:20:02 dyoung Exp $ */
+/* $NetBSD: rt2560.c,v 1.21 2009/09/05 14:19:30 tsutsui Exp $ */
/* $OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $ */
/* $FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/
@@ -24,7 +24,7 @@
* http://www.ralinktech.com/
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.20 2008/11/07 00:20:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.21 2009/09/05 14:19:30 tsutsui Exp $");
#include "bpfilter.h"
@@ -484,10 +484,11 @@
ieee80211_announce(ic);
- if (!pmf_device_register(&sc->sc_dev, NULL, NULL))
- aprint_error_dev(&sc->sc_dev, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(&sc->sc_dev, NULL, NULL))
pmf_class_network_register(&sc->sc_dev, ifp);
+ else
+ aprint_error_dev(&sc->sc_dev,
+ "couldn't establish power handler\n");
return 0;
Index: src/sys/dev/ic/rt2661.c
diff -u src/sys/dev/ic/rt2661.c:1.25 src/sys/dev/ic/rt2661.c:1.26
--- src/sys/dev/ic/rt2661.c:1.25 Fri Nov 7 00:20:03 2008
+++ src/sys/dev/ic/rt2661.c Sat Sep 5 14:19:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2661.c,v 1.25 2008/11/07 00:20:03 dyoung Exp $ */
+/* $NetBSD: rt2661.c,v 1.26 2009/09/05 14:19:30 tsutsui Exp $ */
/* $OpenBSD: rt2661.c,v 1.17 2006/05/01 08:41:11 damien Exp $ */
/* $FreeBSD: rt2560.c,v 1.5 2006/06/02 19:59:31 csjp Exp $ */
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.25 2008/11/07 00:20:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.26 2009/09/05 14:19:30 tsutsui Exp $");
#include "bpfilter.h"
@@ -368,10 +368,11 @@
ieee80211_announce(ic);
- if (!pmf_device_register(&sc->sc_dev, NULL, NULL))
- aprint_
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 14:13:50 UTC 2009
Modified Files:
src/sys/dev/pci: if_an_pci.c if_ath_pci.c if_fxp_pci.c if_gem_pci.c
if_rtk_pci.c if_rtw_pci.c if_wi_pci.c
Log Message:
Invert logic around nested pmf(9) registrations for readability.
XXX: should these pmf(9) calls be moved into MI attach functions
XXX: using function pointers for suspend and resume passed via softc?
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/if_an_pci.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/if_ath_pci.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/if_fxp_pci.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/if_gem_pci.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_rtk_pci.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_rtw_pci.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_wi_pci.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_an_pci.c
diff -u src/sys/dev/pci/if_an_pci.c:1.29 src/sys/dev/pci/if_an_pci.c:1.30
--- src/sys/dev/pci/if_an_pci.c:1.29 Wed May 6 10:34:32 2009
+++ src/sys/dev/pci/if_an_pci.c Sat Sep 5 14:13:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pci.c,v 1.29 2009/05/06 10:34:32 cegger Exp $ */
+/* $NetBSD: if_an_pci.c,v 1.30 2009/09/05 14:13:50 tsutsui Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.29 2009/05/06 10:34:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.30 2009/09/05 14:13:50 tsutsui Exp $");
#include
#include
@@ -168,8 +168,8 @@
bus_space_unmap(sc->sc_iot, sc->sc_ioh, iosize);
}
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, &sc->sc_if);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
Index: src/sys/dev/pci/if_ath_pci.c
diff -u src/sys/dev/pci/if_ath_pci.c:1.33 src/sys/dev/pci/if_ath_pci.c:1.34
--- src/sys/dev/pci/if_ath_pci.c:1.33 Wed May 6 09:25:15 2009
+++ src/sys/dev/pci/if_ath_pci.c Sat Sep 5 14:13:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_pci.c,v 1.33 2009/05/06 09:25:15 cegger Exp $ */
+/* $NetBSD: if_ath_pci.c,v 1.34 2009/09/05 14:13:50 tsutsui Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.11 2005/01/18 18:08:16 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.33 2009/05/06 09:25:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.34 2009/09/05 14:13:50 tsutsui Exp $");
#endif
/*
@@ -260,12 +260,11 @@
if (ath_attach(PCI_PRODUCT(pa->pa_id), sc) != 0)
goto bad3;
- if (!pmf_device_register(self, ath_pci_suspend, ath_pci_resume))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else {
+ if (pmf_device_register(self, ath_pci_suspend, ath_pci_resume)) {
pmf_class_network_register(self, &sc->sc_if);
pmf_device_suspend_self(self);
- }
+ } else
+ aprint_error_dev(self, "couldn't establish power handler\n");
return;
bad3:
ATH_LOCK_DESTROY(sc);
Index: src/sys/dev/pci/if_fxp_pci.c
diff -u src/sys/dev/pci/if_fxp_pci.c:1.69 src/sys/dev/pci/if_fxp_pci.c:1.70
--- src/sys/dev/pci/if_fxp_pci.c:1.69 Fri Apr 17 15:37:43 2009
+++ src/sys/dev/pci/if_fxp_pci.c Sat Sep 5 14:13:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_pci.c,v 1.69 2009/04/17 15:37:43 tsutsui Exp $ */
+/* $NetBSD: if_fxp_pci.c,v 1.70 2009/09/05 14:13:50 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.69 2009/04/17 15:37:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.70 2009/09/05 14:13:50 tsutsui Exp $");
#include "rnd.h"
@@ -482,10 +482,10 @@
fxp_disable(sc);
/* Add a suspend hook to restore PCI config state */
- if (!pmf_device_register(self, NULL, fxp_pci_resume))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, fxp_pci_resume))
pmf_class_network_register(self, &sc->sc_ethercom.ec_if);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
static int
Index: src/sys/dev/pci/if_gem_pci.c
diff -u src/sys/dev/pci/if_gem_pci.c:1.36 src/sys/dev/pci/if_gem_pci.c:1.37
--- src/sys/dev/pci/if_gem_pci.c:1.36 Mon Jul 27 18:10:53 2009
+++ src/sys/dev/pci/if_gem_pci.c Sat Sep 5 14:13:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gem_pci.c,v 1.36 2009/07/27 18:10:53 dyoung Exp $ */
+/* $NetBSD: if_gem_pci.c,v 1.37 2009/09/05 14:13:50 tsutsui Exp $ */
/*
*
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.36 2009/07/27 18:10:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 14:09:55 UTC 2009
Modified Files:
src/sys/dev/pci: if_age.c if_ale.c if_bce.c if_bge.c if_bnx.c if_ipw.c
if_iwi.c if_iwn.c if_lii.c if_msk.c if_nfe.c if_sip.c if_sk.c
if_wm.c if_wpi.c
Log Message:
Invert logic around nested pmf(9) registrations for readability.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_bce.c
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_bnx.c src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_ipw.c
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/pci/if_iwi.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_lii.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/if_nfe.c
cvs rdiff -u -r1.140 -r1.141 src/sys/dev/pci/if_sip.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.179 -r1.180 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_wpi.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_age.c
diff -u src/sys/dev/pci/if_age.c:1.32 src/sys/dev/pci/if_age.c:1.33
--- src/sys/dev/pci/if_age.c:1.32 Wed Aug 5 15:29:51 2009
+++ src/sys/dev/pci/if_age.c Sat Sep 5 14:09:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.32 2009/08/05 15:29:51 cegger Exp $ */
+/* $NetBSD: if_age.c,v 1.33 2009/09/05 14:09:55 tsutsui Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.32 2009/08/05 15:29:51 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.33 2009/09/05 14:09:55 tsutsui Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -290,10 +290,10 @@
if_attach(ifp);
ether_ifattach(ifp, sc->sc_enaddr);
- if (!pmf_device_register(self, NULL, age_resume))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, age_resume))
pmf_class_network_register(self, ifp);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
return;
Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.7 src/sys/dev/pci/if_ale.c:1.8
--- src/sys/dev/pci/if_ale.c:1.7 Tue Aug 18 06:02:36 2009
+++ src/sys/dev/pci/if_ale.c Sat Sep 5 14:09:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ale.c,v 1.7 2009/08/18 06:02:36 cegger Exp $ */
+/* $NetBSD: if_ale.c,v 1.8 2009/09/05 14:09:55 tsutsui Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon
@@ -32,7 +32,7 @@
/* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.7 2009/08/18 06:02:36 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.8 2009/09/05 14:09:55 tsutsui Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -581,10 +581,10 @@
if_attach(ifp);
ether_ifattach(ifp, sc->ale_eaddr);
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
+ if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, ifp);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
return;
fail:
Index: src/sys/dev/pci/if_bce.c
diff -u src/sys/dev/pci/if_bce.c:1.26 src/sys/dev/pci/if_bce.c:1.27
--- src/sys/dev/pci/if_bce.c:1.26 Thu Jul 16 20:14:17 2009
+++ src/sys/dev/pci/if_bce.c Sat Sep 5 14:09:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.26 2009/07/16 20:14:17 jakllsch Exp $ */
+/* $NetBSD: if_bce.c,v 1.27 2009/09/05 14:09:55 tsutsui Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.26 2009/07/16 20:14:17 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.27 2009/09/05 14:09:55 tsutsui Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -472,10 +472,10 @@
#endif
callout_init(&sc->bce_timeout, 0);
- if (!pmf_device_register(self, NULL, bce_resume)) {
- aprint_error_dev(self, "couldn't establish power handler\n");
- } else
+ if (pmf_device_register(self, NULL, bce_resume))
pmf_class_network_register(self, ifp);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
}
/* handle media, and ethernet requests */
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.167 src/sys/dev/pci/if_bge.c:1.168
--- src/sys/dev/pci/if_bge.c:1.167 Sat Jul 25 13:52:47 2009
+++ src/sys/dev/pci/if_bge.c Sat Sep 5 14:09:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.167 2009/07/25 13:52:47 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.168 2009/09/05 14:09:55 tsutsui Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:59:42 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Tickets 1355 - 1358 To generate a diff of this commit: cvs rdiff -u -r1.1.2.175 -r1.1.2.176 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.175 src/doc/CHANGES-4.1:1.1.2.176 --- src/doc/CHANGES-4.1:1.1.2.175 Sat Sep 5 13:46:18 2009 +++ src/doc/CHANGES-4.1 Sat Sep 5 13:59:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.175 2009/09/05 13:46:18 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.176 2009/09/05 13:59:42 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3765,3 +3765,27 @@ Fixes PR/41819 [dsl, ticket #1352] +etc/ssh/ssh_known_hosts1.5 + + add morden, mollari, pkgbuild and build + adjust function names' keys + add the proper names of hosts too in preparation of their + function moving + [spz, ticket #1355] + +usr.bin/netstat/netstat.1 1.52 + + Fix typo + [dholland, ticket #1356] + +usr.bin/chflags/chflags.1 1.18 + + Add some markup to improve clarity. + [dholland, ticket #1357] + +sys/netinet/tcp_usrreq.c 1.148 via patch + + Make the sysctl routines take raise to splnet() before dealing with + any data structures. + [mlelstv, ticket #1358] +
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:59:27 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Tickets 1355 - 1358 To generate a diff of this commit: cvs rdiff -u -r1.1.2.56 -r1.1.2.57 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.56 src/doc/CHANGES-4.0.2:1.1.2.57 --- src/doc/CHANGES-4.0.2:1.1.2.56 Sat Sep 5 13:46:39 2009 +++ src/doc/CHANGES-4.0.2 Sat Sep 5 13:59:27 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.56 2009/09/05 13:46:39 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.57 2009/09/05 13:59:27 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -841,3 +841,27 @@ Fixes PR/41819 [dsl, ticket #1352] +etc/ssh/ssh_known_hosts1.5 + + add morden, mollari, pkgbuild and build + adjust function names' keys + add the proper names of hosts too in preparation of their + function moving + [spz, ticket #1355] + +usr.bin/netstat/netstat.1 1.52 + + Fix typo + [dholland, ticket #1356] + +usr.bin/chflags/chflags.1 1.18 + + Add some markup to improve clarity. + [dholland, ticket #1357] + +sys/netinet/tcp_usrreq.c 1.148 via patch + + Make the sysctl routines take raise to splnet() before dealing with + any data structures. + [mlelstv, ticket #1358] +
CVS commit: [netbsd-4-0] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 13:58:52 UTC 2009
Modified Files:
src/sys/netinet [netbsd-4-0]: tcp_usrreq.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1358):
sys/netinet/tcp_usrreq.c: revision 1.148 via patch
Make the sysctl routines take raise to splnet() before dealing with
any data structures.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.129.8.1 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.129 src/sys/netinet/tcp_usrreq.c:1.129.8.1
--- src/sys/netinet/tcp_usrreq.c:1.129 Fri Nov 10 13:19:16 2006
+++ src/sys/netinet/tcp_usrreq.c Sat Sep 5 13:58:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.129 2006/11/10 13:19:16 yamt Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.129.8.1 2009/09/05 13:58:52 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -102,7 +102,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.129 2006/11/10 13:19:16 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.129.8.1 2009/09/05 13:58:52 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1230,6 +1230,7 @@
u_int op, arg;
size_t len, needed, elem_size, out_size;
int error, elem_count, pf, proto, pf2;
+ int s;
if (namelen != 4)
return (EINVAL);
@@ -1262,6 +1263,7 @@
proto = oname[2];
pf2 = (oldp != NULL) ? pf : 0;
+ s = splnet();
CIRCLEQ_FOREACH(inph, &pcbtbl->inpt_queue, inph_queue) {
#ifdef INET
inp = (const struct inpcb *)inph;
@@ -1384,6 +1386,7 @@
elem_count--;
}
}
+ splx(s);
*oldlenp = needed;
if (oldp == NULL)
CVS commit: [netbsd-4] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 13:58:48 UTC 2009
Modified Files:
src/sys/netinet [netbsd-4]: tcp_usrreq.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1358):
sys/netinet/tcp_usrreq.c: revision 1.148 via patch
Make the sysctl routines take raise to splnet() before dealing with
any data structures.
To generate a diff of this commit:
cvs rdiff -u -r1.129.2.2 -r1.129.2.3 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.129.2.2 src/sys/netinet/tcp_usrreq.c:1.129.2.3
--- src/sys/netinet/tcp_usrreq.c:1.129.2.2 Tue Jan 29 22:37:44 2008
+++ src/sys/netinet/tcp_usrreq.c Sat Sep 5 13:58:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.129.2.2 2008/01/29 22:37:44 pavel Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.129.2.3 2009/09/05 13:58:48 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -102,7 +102,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.129.2.2 2008/01/29 22:37:44 pavel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.129.2.3 2009/09/05 13:58:48 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1323,6 +1323,7 @@
u_int op, arg;
size_t len, needed, elem_size, out_size;
int error, elem_count, pf, proto, pf2;
+ int s;
if (namelen != 4)
return (EINVAL);
@@ -1355,6 +1356,7 @@
proto = oname[2];
pf2 = (oldp != NULL) ? pf : 0;
+ s = splnet();
CIRCLEQ_FOREACH(inph, &pcbtbl->inpt_queue, inph_queue) {
#ifdef INET
inp = (const struct inpcb *)inph;
@@ -1477,6 +1479,7 @@
elem_count--;
}
}
+ splx(s);
*oldlenp = needed;
if (oldp == NULL)
CVS commit: [netbsd-4-0] src/usr.bin/chflags
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:55:53 UTC 2009 Modified Files: src/usr.bin/chflags [netbsd-4-0]: chflags.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #1357): usr.bin/chflags/chflags.1: revision 1.18 Add some markup to improve clarity. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.28.1 src/usr.bin/chflags/chflags.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/chflags/chflags.1 diff -u src/usr.bin/chflags/chflags.1:1.17 src/usr.bin/chflags/chflags.1:1.17.28.1 --- src/usr.bin/chflags/chflags.1:1.17 Thu Aug 7 11:13:16 2003 +++ src/usr.bin/chflags/chflags.1 Sat Sep 5 13:55:53 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: chflags.1,v 1.17 2003/08/07 11:13:16 agc Exp $ +.\" $NetBSD: chflags.1,v 1.17.28.1 2009/09/05 13:55:53 bouyer Exp $ .\" .\" Copyright (c) 1989, 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -72,7 +72,11 @@ option is specified, no symbolic links are followed. .It Fl R Change the file flags for the file hierarchies rooted -in the files instead of just the files themselves. +in the +.Ar files +instead of just the +.Ar files +themselves. .It Fl h If the .Ar file
CVS commit: [netbsd-4] src/usr.bin/chflags
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:55:49 UTC 2009 Modified Files: src/usr.bin/chflags [netbsd-4]: chflags.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #1357): usr.bin/chflags/chflags.1: revision 1.18 Add some markup to improve clarity. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.18.1 src/usr.bin/chflags/chflags.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/chflags/chflags.1 diff -u src/usr.bin/chflags/chflags.1:1.17 src/usr.bin/chflags/chflags.1:1.17.18.1 --- src/usr.bin/chflags/chflags.1:1.17 Thu Aug 7 11:13:16 2003 +++ src/usr.bin/chflags/chflags.1 Sat Sep 5 13:55:49 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: chflags.1,v 1.17 2003/08/07 11:13:16 agc Exp $ +.\" $NetBSD: chflags.1,v 1.17.18.1 2009/09/05 13:55:49 bouyer Exp $ .\" .\" Copyright (c) 1989, 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -72,7 +72,11 @@ option is specified, no symbolic links are followed. .It Fl R Change the file flags for the file hierarchies rooted -in the files instead of just the files themselves. +in the +.Ar files +instead of just the +.Ar files +themselves. .It Fl h If the .Ar file
CVS commit: [netbsd-4-0] src/usr.bin/netstat
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:55:02 UTC 2009 Modified Files: src/usr.bin/netstat [netbsd-4-0]: netstat.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #1356): usr.bin/netstat/netstat.1: revision 1.52 Fix typo To generate a diff of this commit: cvs rdiff -u -r1.45.6.1 -r1.45.6.1.2.1 src/usr.bin/netstat/netstat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/netstat/netstat.1 diff -u src/usr.bin/netstat/netstat.1:1.45.6.1 src/usr.bin/netstat/netstat.1:1.45.6.1.2.1 --- src/usr.bin/netstat/netstat.1:1.45.6.1 Fri Aug 31 14:29:40 2007 +++ src/usr.bin/netstat/netstat.1 Sat Sep 5 13:55:02 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: netstat.1,v 1.45.6.1 2007/08/31 14:29:40 xtraeme Exp $ +.\" $NetBSD: netstat.1,v 1.45.6.1.2.1 2009/09/05 13:55:02 bouyer Exp $ .\" .\" Copyright (c) 1983, 1990, 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -291,7 +291,7 @@ or ``wildcard'', addresses and ports appear as ``*''. You can use the .Xr fstat 1 -to find out which process or processes hold references to a socket. +command to find out which process or processes hold references to a socket. .Pp The interface display provides a table of cumulative statistics regarding packets transferred, errors, and collisions.
CVS commit: [netbsd-4] src/usr.bin/netstat
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:54:59 UTC 2009 Modified Files: src/usr.bin/netstat [netbsd-4]: netstat.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #1356): usr.bin/netstat/netstat.1: revision 1.52 Fix typo To generate a diff of this commit: cvs rdiff -u -r1.45.6.1 -r1.45.6.2 src/usr.bin/netstat/netstat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/netstat/netstat.1 diff -u src/usr.bin/netstat/netstat.1:1.45.6.1 src/usr.bin/netstat/netstat.1:1.45.6.2 --- src/usr.bin/netstat/netstat.1:1.45.6.1 Fri Aug 31 14:29:40 2007 +++ src/usr.bin/netstat/netstat.1 Sat Sep 5 13:54:59 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: netstat.1,v 1.45.6.1 2007/08/31 14:29:40 xtraeme Exp $ +.\" $NetBSD: netstat.1,v 1.45.6.2 2009/09/05 13:54:59 bouyer Exp $ .\" .\" Copyright (c) 1983, 1990, 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -291,7 +291,7 @@ or ``wildcard'', addresses and ports appear as ``*''. You can use the .Xr fstat 1 -to find out which process or processes hold references to a socket. +command to find out which process or processes hold references to a socket. .Pp The interface display provides a table of cumulative statistics regarding packets transferred, errors, and collisions.
CVS commit: [netbsd-4-0] src/etc/ssh
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:53:52 UTC 2009 Modified Files: src/etc/ssh [netbsd-4-0]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #1355): etc/ssh/ssh_known_hosts: revision 1.5 add morden, mollari, pkgbuild and build adjust function names' keys add the proper names of hosts too in preparation of their function moving To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.12.1 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.4 src/etc/ssh/ssh_known_hosts:1.4.12.1 --- src/etc/ssh/ssh_known_hosts:1.4 Tue Sep 26 21:57:06 2006 +++ src/etc/ssh/ssh_known_hosts Sat Sep 5 13:53:52 2009 @@ -1,12 +1,27 @@ -# $NetBSD: ssh_known_hosts,v 1.4 2006/09/26 21:57:06 tron Exp $ +# $NetBSD: ssh_known_hosts,v 1.4.12.1 2009/09/05 13:53:52 bouyer Exp $ # -anoncvs.netbsd.org 1024 33 124527836847225907702134616704062642655823674633646867489991942489052722003567896405835432181052901730304969527126160762854542328265293874791858398238222787853274712973179184350617008506840396224723739301126809289775083202762136105883911120059428253653584248682397589937086051061126544879545951581690785060623 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= -cvs.netbsd.org,cvs4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= -ftp.netbsd.org,ftp4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s= + +pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= + +build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= + +blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +garibaldi.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA7CW/T6MxwXi2qAQSGnSRXqwlwhrKsKVj3VKbsPpFf3fg28259fpqBYHgE4qWlhxg/wEtHoMaxRee1H3KaQwj88ez4fYMgDRkDgFY+NlwII/vgeFFKvjZvzsmfLP75uXC9YS/AlagHmIeubu4ymlgQ29fpwacKmrgCLTrEIXMHPc= + +babylon5.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= + +morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= + +narn.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9
CVS commit: [netbsd-4] src/etc/ssh
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:53:48 UTC 2009 Modified Files: src/etc/ssh [netbsd-4]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #1355): etc/ssh/ssh_known_hosts: revision 1.5 add morden, mollari, pkgbuild and build adjust function names' keys add the proper names of hosts too in preparation of their function moving To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.4 src/etc/ssh/ssh_known_hosts:1.4.2.1 --- src/etc/ssh/ssh_known_hosts:1.4 Tue Sep 26 21:57:06 2006 +++ src/etc/ssh/ssh_known_hosts Sat Sep 5 13:53:48 2009 @@ -1,12 +1,27 @@ -# $NetBSD: ssh_known_hosts,v 1.4 2006/09/26 21:57:06 tron Exp $ +# $NetBSD: ssh_known_hosts,v 1.4.2.1 2009/09/05 13:53:48 bouyer Exp $ # -anoncvs.netbsd.org 1024 33 124527836847225907702134616704062642655823674633646867489991942489052722003567896405835432181052901730304969527126160762854542328265293874791858398238222787853274712973179184350617008506840396224723739301126809289775083202762136105883911120059428253653584248682397589937086051061126544879545951581690785060623 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= -cvs.netbsd.org,cvs4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= -ftp.netbsd.org,ftp4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s= + +pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= + +build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= + +blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +garibaldi.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA7CW/T6MxwXi2qAQSGnSRXqwlwhrKsKVj3VKbsPpFf3fg28259fpqBYHgE4qWlhxg/wEtHoMaxRee1H3KaQwj88ez4fYMgDRkDgFY+NlwII/vgeFFKvjZvzsmfLP75uXC9YS/AlagHmIeubu4ymlgQ29fpwacKmrgCLTrEIXMHPc= + +babylon5.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= + +morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= + +narn.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 13:50:16 UTC 2009
Modified Files:
src/sys/dev/pci: if_tl.c
Log Message:
Replace shutdownhook_establish(9) with pmf_device_register1(9).
Tested Compaq Netelligent 10/100 TX.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/pci/if_tl.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_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.91 src/sys/dev/pci/if_tl.c:1.92
--- src/sys/dev/pci/if_tl.c:1.91 Sun Nov 16 02:11:29 2008
+++ src/sys/dev/pci/if_tl.c Sat Sep 5 13:50:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.91 2008/11/16 02:11:29 tsutsui Exp $ */
+/* $NetBSD: if_tl.c,v 1.92 2009/09/05 13:50:15 tsutsui Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.91 2008/11/16 02:11:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.92 2009/09/05 13:50:15 tsutsui Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -125,7 +125,7 @@
static int tl_ifioctl(struct ifnet *, ioctl_cmd_t, void *);
static int tl_mediachange(struct ifnet *);
static void tl_ifwatchdog(struct ifnet *);
-static void tl_shutdown(void *);
+static bool tl_shutdown(device_t, int);
static void tl_ifstart(struct ifnet *);
static void tl_reset(tl_softc_t *);
@@ -429,12 +429,6 @@
aprint_error_dev(self, "can't allocate DMA memory for lists\n");
return;
}
- /*
- * Add shutdown hook so that DMA is disabled prior to reboot. Not
- * doing
- * reboot before the driver initializes.
- */
- (void)shutdownhook_establish(tl_shutdown, ifp);
/*
* Initialize our media structures and probe the MII.
@@ -477,6 +471,15 @@
if_attach(ifp);
ether_ifattach(&(sc)->tl_if, (sc)->tl_enaddr);
+ /*
+ * Add shutdown hook so that DMA is disabled prior to reboot.
+ * Not doing reboot before the driver initializes.
+ */
+ if (pmf_device_register1(self, NULL, NULL, tl_shutdown))
+ pmf_class_network_register(self, ifp);
+ else
+ aprint_error_dev(self, "couldn't establish power handler\n");
+
#if NRND > 0
rnd_attach_source(&sc->rnd_source, device_xname(self),
RND_TYPE_NET, 0);
@@ -523,11 +526,15 @@
sc->tl_mii.mii_media_status &= ~IFM_ACTIVE;
}
-static void
-tl_shutdown(void *v)
+static bool
+tl_shutdown(device_t self, int howto)
{
+ tl_softc_t *sc = device_private(self);
+ struct ifnet *ifp = &sc->tl_if;
+
+ tl_stop(ifp, 1);
- tl_stop(v, 1);
+ return true;
}
static void
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:46:39 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket #1352 To generate a diff of this commit: cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.55 src/doc/CHANGES-4.0.2:1.1.2.56 --- src/doc/CHANGES-4.0.2:1.1.2.55 Sat Sep 5 13:38:55 2009 +++ src/doc/CHANGES-4.0.2 Sat Sep 5 13:46:39 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.55 2009/09/05 13:38:55 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.56 2009/09/05 13:46:39 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -835,3 +835,9 @@ make update.' external/bsd/pkg_install [joerg, ticket #1346] +sys/kern/kern_exec.c1.149 via patch + + Fix ktrace of data from iovec based system calls. + Fixes PR/41819 + [dsl, ticket #1352] +
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:46:18 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: ticket #1352 To generate a diff of this commit: cvs rdiff -u -r1.1.2.174 -r1.1.2.175 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.174 src/doc/CHANGES-4.1:1.1.2.175 --- src/doc/CHANGES-4.1:1.1.2.174 Tue Aug 25 18:22:37 2009 +++ src/doc/CHANGES-4.1 Sat Sep 5 13:46:18 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.174 2009/08/25 18:22:37 snj Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.175 2009/09/05 13:46:18 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3759,3 +3759,9 @@ Disable completely bogus DIAGNOSTIC check. [bouyer, ticket #1349] +sys/kern/kern_exec.c1.149 via patch + + Fix ktrace of data from iovec based system calls. + Fixes PR/41819 + [dsl, ticket #1352] +
CVS commit: [netbsd-4] src/sys/kern
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:45:43 UTC 2009 Modified Files: src/sys/kern [netbsd-4]: kern_exec.c Log Message: Pull up following revision(s) (requested by dsl in ticket #1352): sys/kern/kern_exec.c: patch Fix ktrace of data from iovec based system calls. Fixes PR/41819 To generate a diff of this commit: cvs rdiff -u -r1.232.2.2 -r1.232.2.3 src/sys/kern/kern_exec.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_exec.c diff -u src/sys/kern/kern_exec.c:1.232.2.2 src/sys/kern/kern_exec.c:1.232.2.3 --- src/sys/kern/kern_exec.c:1.232.2.2 Sat Dec 30 05:22:43 2006 +++ src/sys/kern/kern_exec.c Sat Sep 5 13:45:43 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exec.c,v 1.232.2.2 2006/12/30 05:22:43 riz Exp $ */ +/* $NetBSD: kern_exec.c,v 1.232.2.3 2009/09/05 13:45:43 bouyer Exp $ */ /*- * Copyright (C) 1993, 1994, 1996 Christopher G. Demetriou @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.232.2.2 2006/12/30 05:22:43 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.232.2.3 2009/09/05 13:45:43 bouyer Exp $"); #include "opt_ktrace.h" #include "opt_syscall_debug.h" @@ -518,7 +518,11 @@ cp = *tmpfap; while (*cp) *dp++ = *cp++; - dp++; + *dp++ = 0; +#ifdef KTRACE + if (KTRPOINT(p, KTR_EXEC_ARG)) +ktrkmem(l, KTR_EXEC_ARG, *tmpfap, cp - *tmpfap); +#endif FREE(*tmpfap, M_EXEC); tmpfap++; argc++;
CVS commit: [netbsd-4-0] src/sys/kern
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:45:28 UTC 2009 Modified Files: src/sys/kern [netbsd-4-0]: kern_exec.c Log Message: Pull up following revision(s) (requested by dsl in ticket #1352): sys/kern/kern_exec.c: patch Fix ktrace of data from iovec based system calls. Fixes PR/41819 To generate a diff of this commit: cvs rdiff -u -r1.232.2.2 -r1.232.2.2.6.1 src/sys/kern/kern_exec.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_exec.c diff -u src/sys/kern/kern_exec.c:1.232.2.2 src/sys/kern/kern_exec.c:1.232.2.2.6.1 --- src/sys/kern/kern_exec.c:1.232.2.2 Sat Dec 30 05:22:43 2006 +++ src/sys/kern/kern_exec.c Sat Sep 5 13:45:28 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exec.c,v 1.232.2.2 2006/12/30 05:22:43 riz Exp $ */ +/* $NetBSD: kern_exec.c,v 1.232.2.2.6.1 2009/09/05 13:45:28 bouyer Exp $ */ /*- * Copyright (C) 1993, 1994, 1996 Christopher G. Demetriou @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.232.2.2 2006/12/30 05:22:43 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.232.2.2.6.1 2009/09/05 13:45:28 bouyer Exp $"); #include "opt_ktrace.h" #include "opt_syscall_debug.h" @@ -518,7 +518,11 @@ cp = *tmpfap; while (*cp) *dp++ = *cp++; - dp++; + *dp++ = 0; +#ifdef KTRACE + if (KTRPOINT(p, KTR_EXEC_ARG)) +ktrkmem(l, KTR_EXEC_ARG, *tmpfap, cp - *tmpfap); +#endif FREE(*tmpfap, M_EXEC); tmpfap++; argc++;
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:38:55 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket #1346 To generate a diff of this commit: cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.54 src/doc/CHANGES-4.0.2:1.1.2.55 --- src/doc/CHANGES-4.0.2:1.1.2.54 Tue Aug 25 18:21:50 2009 +++ src/doc/CHANGES-4.0.2 Sat Sep 5 13:38:55 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.54 2009/08/25 18:21:50 snj Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.55 2009/09/05 13:38:55 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -820,3 +820,18 @@ Disable completely bogus DIAGNOSTIC check. [bouyer, ticket #1349] +external/bsd/pkg_install/dist/info/perform.c 1.1.1.10 +external/bsd/pkg_install/dist/lib/license.c 1.1.1.4 +external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in 1.1.1.5 +external/bsd/pkg_install/dist/lib/version.h 1.1.1.17 + + Import pkg_install-20090724: + - license handling: accept upper case letters. Keep license checks + case-sensitive as done in the older pkgsrc logic. Document this. + OK dillo@, schmonz@, wiz@ + - pkg_info: + - fix handling of non-packages, that are valid archives + - invert order of pkg_info -r to better match the expectations of + make update.' external/bsd/pkg_install + [joerg, ticket #1346] +
CVS commit: [netbsd-4-0] src/external/bsd/pkg_install/dist
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 13:37:42 UTC 2009
Modified Files:
src/external/bsd/pkg_install/dist/info [netbsd-4-0]: perform.c
src/external/bsd/pkg_install/dist/lib [netbsd-4-0]: license.c
pkg_install.conf.5.in version.h
Log Message:
Pull up the following revisions (requested by joerg in ticket #1346):
external/bsd/pkg_install/dist/info/perform.c 1.1.1.10
external/bsd/pkg_install/dist/lib/license.c 1.1.1.4
external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in 1.1.1.5
external/bsd/pkg_install/dist/lib/version.h 1.1.1.17
Import pkg_install-20090724:
- license handling: accept upper case letters. Keep license checks
case-sensitive as done in the older pkgsrc logic. Document this.
OK dillo@, schmonz@, wiz@
- pkg_info:
- fix handling of non-packages, that are valid archives
- invert order of pkg_info -r to better match the expectations of
make update.' external/bsd/pkg_install
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9.2.2 -r1.1.1.9.2.3 \
src/external/bsd/pkg_install/dist/info/perform.c
cvs rdiff -u -r1.1.1.2.6.3 -r1.1.1.2.6.4 \
src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.1.1.4.8.2 -r1.1.1.4.8.3 \
src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
cvs rdiff -u -r1.1.1.15.2.3 -r1.1.1.15.2.4 \
src/external/bsd/pkg_install/dist/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pkg_install/dist/info/perform.c
diff -u src/external/bsd/pkg_install/dist/info/perform.c:1.1.1.9.2.2 src/external/bsd/pkg_install/dist/info/perform.c:1.1.1.9.2.3
--- src/external/bsd/pkg_install/dist/info/perform.c:1.1.1.9.2.2 Fri Jun 5 17:01:59 2009
+++ src/external/bsd/pkg_install/dist/info/perform.c Sat Sep 5 13:37:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.1.1.9.2.2 2009/06/05 17:01:59 snj Exp $ */
+/* $NetBSD: perform.c,v 1.1.1.9.2.3 2009/09/05 13:37:41 bouyer Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -13,7 +13,7 @@
#if HAVE_SYS_WAIT_H
#include
#endif
-__RCSID("$NetBSD: perform.c,v 1.1.1.9.2.2 2009/06/05 17:01:59 snj Exp $");
+__RCSID("$NetBSD: perform.c,v 1.1.1.9.2.3 2009/09/05 13:37:41 bouyer Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger .
@@ -232,7 +232,7 @@
}
meta->is_installed = 0;
- if (found_required != 0 && r != ARCHIVE_OK && r != ARCHIVE_EOF) {
+ if (found_required != 0 || (r != ARCHIVE_OK && r != ARCHIVE_EOF)) {
free_pkg_meta(meta);
meta = NULL;
}
@@ -326,7 +326,7 @@
build_full_reqby(reqby, meta_dep, limit + 1);
free_pkg_meta(meta_dep);
- TAILQ_INSERT_TAIL(reqby, lpp, lp_link);
+ TAILQ_INSERT_HEAD(reqby, lpp, lp_link);
}
}
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.6.3 src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.6.4
--- src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.6.3 Sun Jun 21 11:42:52 2009
+++ src/external/bsd/pkg_install/dist/lib/license.c Sat Sep 5 13:37:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.1.1.2.6.3 2009/06/21 11:42:52 bouyer Exp $ */
+/* $NetBSD: license.c,v 1.1.1.2.6.4 2009/09/05 13:37:42 bouyer Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger .
@@ -56,7 +56,9 @@
"artistic artistic-2.0 "
"cddl-1.0 "
"cpl-1.0 "
-"open-font-license ";
+"open-font-license "
+"mpl-1.1 "
+"zpl";
#ifdef DEBUG
static size_t hash_collisions;
@@ -64,7 +66,8 @@
static char **license_hash[HASH_SIZE];
static const char license_spaces[] = " \t\n";
-static const char license_chars[] = "abcdefghijklmnopqrstuvwxyz0123456789_-.";
+static const char license_chars[] =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-.";
static size_t
hash_license(const char *license, size_t len)
Index: src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
diff -u src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.1.1.4.8.2 src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.1.1.4.8.3
--- src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.1.1.4.8.2 Fri Jun 5 17:02:00 2009
+++ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in Sat Sep 5 13:37:42 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.4.8.2 2009/06/05 17:02:00 snj Exp $
+.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.4.8.3 2009/09/05 13:37:42 bouyer Exp $
.\"
.\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -50,6 +50,7 @@
.Bl -tag -width indent
.It Dv ACCEPTABLE_LICENSES
List of licenses packages are allowed to carry.
+License names are case-sensitive.
.It Dv ACTIVE_FTP
Force the use of active FTP.
.It Dv CERTIFICATE_ANCHOR_PKGS
@@ -83,6 +84,9 @@
.El
.It Dv DEFAULT_ACCEPTABLE_LICENSES
List of common Free and Open Source licenses packages are allowed to car
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:18:33 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Tickets 925, 933, 934, 939 To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.9 src/doc/CHANGES-5.0.2:1.1.2.10 --- src/doc/CHANGES-5.0.2:1.1.2.9 Sat Sep 5 11:46:58 2009 +++ src/doc/CHANGES-5.0.2 Sat Sep 5 13:18:33 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.9 2009/09/05 11:46:58 bouyer Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.10 2009/09/05 13:18:33 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -202,3 +202,27 @@ Patch supplied by Pierre Pronchery in PR bin/41490. [tron, ticket #914] +usr.bin/newsyslog/newsyslog.c 1.59 + + Reset ziptype on each line. Failure to do this caused any log file to + be compressed if it was listed after a line using Z or J flag. + [manu, ticket #925] + +usr.bin/netstat/netstat.1 1.52 + + Fix typo + [dholland, ticket #933] + +usr.bin/chflags/chflags.1 1.18 + + Add some markup to improve clarity. + [dholland, ticket #934] + +sys/dev/acpi/pckbc_acpi.c 1.32 + + PR# port-i386/39671: panic while booting with an acpi kernel on a + 790GX board + If the firmware describes duplicate keyboard controller nodes, + don't panic when the driver fails to map registers. + [jmcneill, ticket #939] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:18:04 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 920-922, 924, 925, 929, 933, 934, 939 To generate a diff of this commit: cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.64 src/doc/CHANGES-5.1:1.1.2.65 --- src/doc/CHANGES-5.1:1.1.2.64 Sat Sep 5 11:46:29 2009 +++ src/doc/CHANGES-5.1 Sat Sep 5 13:18:04 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.64 2009/09/05 11:46:29 bouyer Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.65 2009/09/05 13:18:04 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -2342,3 +2342,65 @@ Patch supplied by Pierre Pronchery in PR bin/41490. [tron, ticket #914] +lib/libevent/Makefile1.7, 1.8 +lib/libevent/event.h1.7 + + Matthias Drochner pointed out that I lost the _EVENT_ prefix from all + the autoconf defines in the installed event_config.h. + Fix this approximately as the stock libevent Makefile does. + Also, some applications written for newer libevent + want event.h to pull in event_config.h by magic. + [tls, ticket #920] + +lib/libpthread/pthread_cancelstub.c 1.27 via patch +lib/libpthread/pthread_misc.c 1.14 via patch + + Make nanosleep cancelable again. + [enami, ticket #921] + +sys/dev/usb/if_cdce.c1.22 + + Add support for the Openmoko Freerunner to cdce(4) ported from FreeBSD. + The patch was supplied by Pierre Pronchery in PR kern/40049. + [tron, ticket #922] + +distrib/utils/sysinst/disks.c 1.106 + + PR# install/41925: sysinst find_disks() should display more than just + the device name + Try ATA/SCSI identify commands and when successful, use the model + information along with the disk size when creating the + 'Available disks' menu. + [jmcneill, ticket #924] + +usr.bin/newsyslog/newsyslog.c 1.59 + + Reset ziptype on each line. Failure to do this caused any log file to + be compressed if it was listed after a line using Z or J flag. + [manu, ticket #925] + +sys/kern/subr_tftproot.c 1.9, 1.10 + + When netbooting, rootspec is now "md0a", and it has no chance to match + an interface name, so look for bootdv if looking for rootspec + didn't work. + [manu, ticket #929] + +usr.bin/netstat/netstat.1 1.52 + + Fix typo + [dholland, ticket #933] + +usr.bin/chflags/chflags.1 1.18 + + Add some markup to improve clarity. + [dholland, ticket #934] + +sys/dev/acpi/pckbc_acpi.c 1.32 + + PR# port-i386/39671: panic while booting with an acpi kernel on a + 790GX board + If the firmware describes duplicate keyboard controller nodes, + don't panic when the driver fails to map registers. + [jmcneill, ticket #939] +
CVS commit: [netbsd-5-0] src/sys/dev/acpi
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 13:10:18 UTC 2009
Modified Files:
src/sys/dev/acpi [netbsd-5-0]: pckbc_acpi.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #939):
sys/dev/acpi/pckbc_acpi.c: revision 1.32
PR# port-i386/39671: panic while booting with an acpi kernel on a 790GX board
If the firmware describes duplicate keyboard controller nodes, don't panic
when the driver fails to map registers.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.10.1 src/sys/dev/acpi/pckbc_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/pckbc_acpi.c
diff -u src/sys/dev/acpi/pckbc_acpi.c:1.30 src/sys/dev/acpi/pckbc_acpi.c:1.30.10.1
--- src/sys/dev/acpi/pckbc_acpi.c:1.30 Tue Sep 16 11:24:55 2008
+++ src/sys/dev/acpi/pckbc_acpi.c Sat Sep 5 13:10:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.30 2008/09/16 11:24:55 pgoyette Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.30.10.1 2009/09/05 13:10:18 bouyer Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.30 2008/09/16 11:24:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.30.10.1 2009/09/05 13:10:18 bouyer Exp $");
#include
#include
@@ -207,8 +207,11 @@
if (bus_space_map(aa->aa_iot, io0->ar_base,
io0->ar_length, 0, &ioh_d) ||
bus_space_map(aa->aa_iot, io1->ar_base,
- io1->ar_length, 0, &ioh_c))
-panic("pckbc_acpi_attach: couldn't map");
+ io1->ar_length, 0, &ioh_c)) {
+aprint_error_dev(self,
+"unable to map registers\n");
+goto out;
+ }
t = malloc(sizeof(struct pckbc_internal),
M_DEVBUF, M_WAITOK|M_ZERO);
@@ -229,9 +232,11 @@
first->sc_pckbc.intr_establish = pckbc_acpi_intr_establish;
config_defer(first->sc_pckbc.sc_dv, pckbc_acpi_finish_attach);
- } else if (!pmf_device_register(self, NULL, NULL))
+ }
+
+out:
+ if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
- out:
acpi_resource_cleanup(&res);
}
CVS commit: [netbsd-5] src/sys/dev/acpi
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 13:10:03 UTC 2009
Modified Files:
src/sys/dev/acpi [netbsd-5]: pckbc_acpi.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #939):
sys/dev/acpi/pckbc_acpi.c: revision 1.32
PR# port-i386/39671: panic while booting with an acpi kernel on a 790GX board
If the firmware describes duplicate keyboard controller nodes, don't panic
when the driver fails to map registers.
To generate a diff of this commit:
cvs rdiff -u -r1.30.4.1 -r1.30.4.2 src/sys/dev/acpi/pckbc_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/pckbc_acpi.c
diff -u src/sys/dev/acpi/pckbc_acpi.c:1.30.4.1 src/sys/dev/acpi/pckbc_acpi.c:1.30.4.2
--- src/sys/dev/acpi/pckbc_acpi.c:1.30.4.1 Fri May 1 01:38:17 2009
+++ src/sys/dev/acpi/pckbc_acpi.c Sat Sep 5 13:10:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.30.4.1 2009/05/01 01:38:17 snj Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.30.4.2 2009/09/05 13:10:03 bouyer Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.30.4.1 2009/05/01 01:38:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.30.4.2 2009/09/05 13:10:03 bouyer Exp $");
#include
#include
@@ -206,8 +206,11 @@
if (bus_space_map(aa->aa_iot, io0->ar_base,
io0->ar_length, 0, &ioh_d) ||
bus_space_map(aa->aa_iot, io1->ar_base,
- io1->ar_length, 0, &ioh_c))
-panic("pckbc_acpi_attach: couldn't map");
+ io1->ar_length, 0, &ioh_c)) {
+aprint_error_dev(self,
+"unable to map registers\n");
+goto out;
+ }
t = malloc(sizeof(struct pckbc_internal),
M_DEVBUF, M_WAITOK|M_ZERO);
@@ -228,9 +231,11 @@
first->sc_pckbc.intr_establish = pckbc_acpi_intr_establish;
config_defer(first->sc_pckbc.sc_dv, pckbc_acpi_finish_attach);
- } else if (!pmf_device_register(self, NULL, NULL))
+ }
+
+out:
+ if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
- out:
acpi_resource_cleanup(&res);
}
CVS commit: [netbsd-5-0] src/usr.bin/chflags
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:06:35 UTC 2009 Modified Files: src/usr.bin/chflags [netbsd-5-0]: chflags.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #934): usr.bin/chflags/chflags.1: revision 1.18 Add some markup to improve clarity. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.44.1 src/usr.bin/chflags/chflags.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/chflags/chflags.1 diff -u src/usr.bin/chflags/chflags.1:1.17 src/usr.bin/chflags/chflags.1:1.17.44.1 --- src/usr.bin/chflags/chflags.1:1.17 Thu Aug 7 11:13:16 2003 +++ src/usr.bin/chflags/chflags.1 Sat Sep 5 13:06:35 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: chflags.1,v 1.17 2003/08/07 11:13:16 agc Exp $ +.\" $NetBSD: chflags.1,v 1.17.44.1 2009/09/05 13:06:35 bouyer Exp $ .\" .\" Copyright (c) 1989, 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -72,7 +72,11 @@ option is specified, no symbolic links are followed. .It Fl R Change the file flags for the file hierarchies rooted -in the files instead of just the files themselves. +in the +.Ar files +instead of just the +.Ar files +themselves. .It Fl h If the .Ar file
CVS commit: [netbsd-5] src/usr.bin/chflags
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:06:31 UTC 2009 Modified Files: src/usr.bin/chflags [netbsd-5]: chflags.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #934): usr.bin/chflags/chflags.1: revision 1.18 Add some markup to improve clarity. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.40.1 src/usr.bin/chflags/chflags.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/chflags/chflags.1 diff -u src/usr.bin/chflags/chflags.1:1.17 src/usr.bin/chflags/chflags.1:1.17.40.1 --- src/usr.bin/chflags/chflags.1:1.17 Thu Aug 7 11:13:16 2003 +++ src/usr.bin/chflags/chflags.1 Sat Sep 5 13:06:30 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: chflags.1,v 1.17 2003/08/07 11:13:16 agc Exp $ +.\" $NetBSD: chflags.1,v 1.17.40.1 2009/09/05 13:06:30 bouyer Exp $ .\" .\" Copyright (c) 1989, 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -72,7 +72,11 @@ option is specified, no symbolic links are followed. .It Fl R Change the file flags for the file hierarchies rooted -in the files instead of just the files themselves. +in the +.Ar files +instead of just the +.Ar files +themselves. .It Fl h If the .Ar file
CVS commit: [netbsd-5-0] src/usr.bin/netstat
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:05:37 UTC 2009 Modified Files: src/usr.bin/netstat [netbsd-5-0]: netstat.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #933): usr.bin/netstat/netstat.1: revision 1.52 Fix typo To generate a diff of this commit: cvs rdiff -u -r1.48.12.1 -r1.48.12.1.2.1 src/usr.bin/netstat/netstat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/netstat/netstat.1 diff -u src/usr.bin/netstat/netstat.1:1.48.12.1 src/usr.bin/netstat/netstat.1:1.48.12.1.2.1 --- src/usr.bin/netstat/netstat.1:1.48.12.1 Mon Feb 23 08:43:12 2009 +++ src/usr.bin/netstat/netstat.1 Sat Sep 5 13:05:37 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: netstat.1,v 1.48.12.1 2009/02/23 08:43:12 snj Exp $ +.\" $NetBSD: netstat.1,v 1.48.12.1.2.1 2009/09/05 13:05:37 bouyer Exp $ .\" .\" Copyright (c) 1983, 1990, 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -290,7 +290,7 @@ or ``wildcard'', addresses and ports appear as ``*''. You can use the .Xr fstat 1 -to find out which process or processes hold references to a socket. +command to find out which process or processes hold references to a socket. .Pp The interface display provides a table of cumulative statistics regarding packets transferred, errors, and collisions.
CVS commit: [netbsd-5] src/usr.bin/netstat
Module Name:src Committed By: bouyer Date: Sat Sep 5 13:05:35 UTC 2009 Modified Files: src/usr.bin/netstat [netbsd-5]: netstat.1 Log Message: Pull up following revision(s) (requested by dholland in ticket #933): usr.bin/netstat/netstat.1: revision 1.52 Fix typo To generate a diff of this commit: cvs rdiff -u -r1.48.12.1 -r1.48.12.2 src/usr.bin/netstat/netstat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/netstat/netstat.1 diff -u src/usr.bin/netstat/netstat.1:1.48.12.1 src/usr.bin/netstat/netstat.1:1.48.12.2 --- src/usr.bin/netstat/netstat.1:1.48.12.1 Mon Feb 23 08:43:12 2009 +++ src/usr.bin/netstat/netstat.1 Sat Sep 5 13:05:35 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: netstat.1,v 1.48.12.1 2009/02/23 08:43:12 snj Exp $ +.\" $NetBSD: netstat.1,v 1.48.12.2 2009/09/05 13:05:35 bouyer Exp $ .\" .\" Copyright (c) 1983, 1990, 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -290,7 +290,7 @@ or ``wildcard'', addresses and ports appear as ``*''. You can use the .Xr fstat 1 -to find out which process or processes hold references to a socket. +command to find out which process or processes hold references to a socket. .Pp The interface display provides a table of cumulative statistics regarding packets transferred, errors, and collisions.
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 13:04:26 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: subr_tftproot.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #929):
sys/kern/subr_tftproot.c: revisions 1.9, 1.10
When netbooting, rootspec is now "md0a", and it has no chance to match
an interface name, so do not give it a try.
Back out previous change: do not skip the test on rootspec, but make it
a simple attempt instead of an authoritative answer. The failure of the
rootspec test could me machine-dependant. Thanks to martin@ for pointing
that out.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.12.1 src/sys/kern/subr_tftproot.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/subr_tftproot.c
diff -u src/sys/kern/subr_tftproot.c:1.5 src/sys/kern/subr_tftproot.c:1.5.12.1
--- src/sys/kern/subr_tftproot.c:1.5 Thu Apr 24 11:38:36 2008
+++ src/sys/kern/subr_tftproot.c Sat Sep 5 13:04:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_tftproot.c,v 1.5 2008/04/24 11:38:36 ad Exp $ */
+/* $NetBSD: subr_tftproot.c,v 1.5.12.1 2009/09/05 13:04:26 bouyer Exp $ */
/*-
* Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved.
@@ -39,7 +39,7 @@
#include "opt_md.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.5 2008/04/24 11:38:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.5.12.1 2009/09/05 13:04:26 bouyer Exp $");
#include
#include
@@ -134,7 +134,10 @@
IFNET_FOREACH(ifp)
if (strcmp(rootspec, ifp->if_xname) == 0)
break;
- } else if ((bootdv != NULL && device_class(bootdv) == DV_IFNET)) {
+ }
+
+ if ((ifp == NULL) &&
+ (bootdv != NULL && device_class(bootdv) == DV_IFNET)) {
IFNET_FOREACH(ifp)
if (strcmp(device_xname(bootdv), ifp->if_xname) == 0)
break;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 12:59:24 UTC 2009
Modified Files:
src/sys/dev/pci: ahd_pci.c
Log Message:
Use device_t self arg to get a device name rather than through &ahd->sc_dev
which needs to be changed on future device_t/softc split.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/ahd_pci.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/ahd_pci.c
diff -u src/sys/dev/pci/ahd_pci.c:1.29 src/sys/dev/pci/ahd_pci.c:1.30
--- src/sys/dev/pci/ahd_pci.c:1.29 Sat Sep 5 12:55:05 2009
+++ src/sys/dev/pci/ahd_pci.c Sat Sep 5 12:59:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ahd_pci.c,v 1.29 2009/09/05 12:55:05 tsutsui Exp $ */
+/* $NetBSD: ahd_pci.c,v 1.30 2009/09/05 12:59:24 tsutsui Exp $ */
/*
* Product specific probe and attach routines for:
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.29 2009/09/05 12:55:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.30 2009/09/05 12:59:24 tsutsui Exp $");
#define AHD_PCI_IOADDR PCI_MAPREG_START /* I/O Address */
#define AHD_PCI_MEMADDR (PCI_MAPREG_START + 4) /* Mem I/O Address */
@@ -318,7 +318,7 @@
const char *intrstr;
struct ahd_pci_busdata *bd;
- ahd_set_name(ahd, device_xname(&ahd->sc_dev));
+ ahd_set_name(ahd, device_xname(self));
ahd->parent_dmat = pa->pa_dmat;
command = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
@@ -396,7 +396,7 @@
if (!pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_PCIX,
&bd->pcix_off, NULL)) {
if (ahd->chip & AHD_PCIX)
- aprint_error_dev(&ahd->sc_dev,
+ aprint_error_dev(self,
"warning: can't find PCI-X capability\n");
ahd->chip &= ~AHD_PCIX;
ahd->chip |= AHD_PCI;
@@ -484,7 +484,7 @@
/* power up chip */
if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self,
pci_activate_null)) && error != EOPNOTSUPP) {
- aprint_error_dev(&ahd->sc_dev, "cannot activate %d\n", error);
+ aprint_error_dev(self, "cannot activate %d\n", error);
return;
}
/*
CVS commit: [netbsd-5-0] src/usr.bin/newsyslog
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 12:58:29 UTC 2009
Modified Files:
src/usr.bin/newsyslog [netbsd-5-0]: newsyslog.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #925):
usr.bin/newsyslog/newsyslog.c: revision 1.59
Reset ziptype on each line. Failure to do this caused any log file to
be compressed if it was listed after a line using Z or J flag. For
instance, we compressed log2 with the config file below:
/var/log/log1600 5100 *Z
/var/log/log2600 7100 *-
To generate a diff of this commit:
cvs rdiff -u -r1.53.10.1 -r1.53.10.1.2.1 src/usr.bin/newsyslog/newsyslog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/newsyslog/newsyslog.c
diff -u src/usr.bin/newsyslog/newsyslog.c:1.53.10.1 src/usr.bin/newsyslog/newsyslog.c:1.53.10.1.2.1
--- src/usr.bin/newsyslog/newsyslog.c:1.53.10.1 Tue Feb 24 02:47:30 2009
+++ src/usr.bin/newsyslog/newsyslog.c Sat Sep 5 12:58:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: newsyslog.c,v 1.53.10.1 2009/02/24 02:47:30 snj Exp $ */
+/* $NetBSD: newsyslog.c,v 1.53.10.1.2.1 2009/09/05 12:58:29 bouyer Exp $ */
/*
* Copyright (c) 1999, 2000 Andrew Doran
@@ -55,7 +55,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: newsyslog.c,v 1.53.10.1 2009/02/24 02:47:30 snj Exp $");
+__RCSID("$NetBSD: newsyslog.c,v 1.53.10.1.2.1 2009/09/05 12:58:29 bouyer Exp $");
#endif /* not lint */
#include
@@ -246,6 +246,7 @@
rv = -1;
line = NULL;
+ ziptype = 0;
/* Place the white-space separated fields into an array. */
do {
CVS commit: [netbsd-5] src/usr.bin/newsyslog
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 12:58:07 UTC 2009
Modified Files:
src/usr.bin/newsyslog [netbsd-5]: newsyslog.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #925):
usr.bin/newsyslog/newsyslog.c: revision 1.59
Reset ziptype on each line. Failure to do this caused any log file to
be compressed if it was listed after a line using Z or J flag. For
instance, we compressed log2 with the config file below:
/var/log/log1600 5100 *Z
/var/log/log2600 7100 *-
To generate a diff of this commit:
cvs rdiff -u -r1.53.10.1 -r1.53.10.2 src/usr.bin/newsyslog/newsyslog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/newsyslog/newsyslog.c
diff -u src/usr.bin/newsyslog/newsyslog.c:1.53.10.1 src/usr.bin/newsyslog/newsyslog.c:1.53.10.2
--- src/usr.bin/newsyslog/newsyslog.c:1.53.10.1 Tue Feb 24 02:47:30 2009
+++ src/usr.bin/newsyslog/newsyslog.c Sat Sep 5 12:58:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: newsyslog.c,v 1.53.10.1 2009/02/24 02:47:30 snj Exp $ */
+/* $NetBSD: newsyslog.c,v 1.53.10.2 2009/09/05 12:58:07 bouyer Exp $ */
/*
* Copyright (c) 1999, 2000 Andrew Doran
@@ -55,7 +55,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: newsyslog.c,v 1.53.10.1 2009/02/24 02:47:30 snj Exp $");
+__RCSID("$NetBSD: newsyslog.c,v 1.53.10.2 2009/09/05 12:58:07 bouyer Exp $");
#endif /* not lint */
#include
@@ -246,6 +246,7 @@
rv = -1;
line = NULL;
+ ziptype = 0;
/* Place the white-space separated fields into an array. */
do {
CVS commit: [netbsd-5] src/distrib/utils/sysinst
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 12:57:00 UTC 2009
Modified Files:
src/distrib/utils/sysinst [netbsd-5]: disks.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #924):
distrib/utils/sysinst/disks.c: revision 1.106
PR# install/41925: sysinst find_disks() should display more than just
the device name
Try ATA/SCSI identify commands and when successful, use the model information
along with the disk size when creating the 'Available disks' menu.
Instead of having a list of disks (wd0, wd1, sd0) the menu now looks like:
Available disks
>a: wd0 (977M, SanDisk SDCFB-1024)
b: wd1 (233G, FUJITSU MHY2250BH)
c: sd0 (246M, LEXAR JUMPDRIVE ELITE)
ok martin@
To generate a diff of this commit:
cvs rdiff -u -r1.100.2.3 -r1.100.2.4 src/distrib/utils/sysinst/disks.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/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.100.2.3 src/distrib/utils/sysinst/disks.c:1.100.2.4
--- src/distrib/utils/sysinst/disks.c:1.100.2.3 Mon May 18 19:35:14 2009
+++ src/distrib/utils/sysinst/disks.c Sat Sep 5 12:57:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.100.2.3 2009/05/18 19:35:14 bouyer Exp $ */
+/* $NetBSD: disks.c,v 1.100.2.4 2009/09/05 12:57:00 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -56,6 +56,12 @@
#include
#undef static
+#include
+#include
+
+#include
+#include
+
#include "defs.h"
#include "md.h"
#include "msg_defs.h"
@@ -66,6 +72,7 @@
#define MAX_DISKS 15
struct disk_desc {
char dd_name[SSTRSIZE];
+ char dd_descr[70];
uint dd_no_mbr;
uint dd_cyl;
uint dd_head;
@@ -88,6 +95,213 @@
static const char *disk_names[] = { DISK_NAMES, "vnd", NULL };
+/* from src/sbin/atactl/atactl.c
+ * extract_string: copy a block of bytes out of ataparams and make
+ * a proper string out of it, truncating trailing spaces and preserving
+ * strict typing. And also, not doing unaligned accesses.
+ */
+static void
+ata_extract_string(char *buf, size_t bufmax,
+ uint8_t *bytes, unsigned numbytes,
+ int needswap)
+{
+ unsigned i;
+ size_t j;
+ unsigned char ch1, ch2;
+
+ for (i = 0, j = 0; i < numbytes; i += 2) {
+ ch1 = bytes[i];
+ ch2 = bytes[i+1];
+ if (needswap && j < bufmax-1) {
+ buf[j++] = ch2;
+ }
+ if (j < bufmax-1) {
+ buf[j++] = ch1;
+ }
+ if (!needswap && j < bufmax-1) {
+ buf[j++] = ch2;
+ }
+ }
+ while (j > 0 && buf[j-1] == ' ') {
+ j--;
+ }
+ buf[j] = '\0';
+}
+
+/*
+ * from src/sbin/scsictl/scsi_subr.c
+ */
+#define STRVIS_ISWHITE(x) ((x) == ' ' || (x) == '\0' || (x) == (u_char)'\377')
+
+static void
+scsi_strvis(char *sdst, size_t dlen, const char *ssrc, size_t slen)
+{
+ u_char *dst = (u_char *)sdst;
+ const u_char *src = (const u_char *)ssrc;
+
+ /* Trim leading and trailing blanks and NULs. */
+ while (slen > 0 && STRVIS_ISWHITE(src[0]))
+ ++src, --slen;
+ while (slen > 0 && STRVIS_ISWHITE(src[slen - 1]))
+ --slen;
+
+ while (slen > 0) {
+ if (*src < 0x20 || *src >= 0x80) {
+ /* non-printable characters */
+ dlen -= 4;
+ if (dlen < 1)
+break;
+ *dst++ = '\\';
+ *dst++ = ((*src & 0300) >> 6) + '0';
+ *dst++ = ((*src & 0070) >> 3) + '0';
+ *dst++ = ((*src & 0007) >> 0) + '0';
+ } else if (*src == '\\') {
+ /* quote characters */
+ dlen -= 2;
+ if (dlen < 1)
+break;
+ *dst++ = '\\';
+ *dst++ = '\\';
+ } else {
+ /* normal characters */
+ if (--dlen < 1)
+break;
+ *dst++ = *src;
+ }
+ ++src, --slen;
+ }
+
+ *dst++ = 0;
+}
+
+
+static int
+get_descr_scsi(struct disk_desc *dd, int fd)
+{
+ struct scsipi_inquiry_data inqbuf;
+ struct scsipi_inquiry cmd;
+ scsireq_t req;
+/* x4 in case every character is escaped, +1 for NUL. */
+ char vendor[(sizeof(inqbuf.vendor) * 4) + 1],
+ product[(sizeof(inqbuf.product) * 4) + 1],
+ revision[(sizeof(inqbuf.revision) * 4) + 1];
+ char size[5];
+ int error;
+
+ memset(&inqbuf, 0, sizeof(inqbuf));
+ memset(&cmd, 0, sizeof(cmd));
+ memset(&req, 0, sizeof(req));
+
+ cmd.opcode = INQUIRY;
+ cmd.length = sizeof(inqbuf);
+ memcpy(req.cmd, &cmd, sizeof(cmd));
+ req.cmdlen = sizeof(cmd);
+ req.databuf = &inqbuf;
+ req.datalen = sizeof(inqbuf);
+ req.timeout = 1;
+ req.flags = SCCMD_READ;
+ req.senselen = SENSEBUFLEN;
+
+ error = ioctl(fd, SCIOCCOMMAND, &req);
+ if (error == -1 || req.retsts != SCCMD_OK)
+ return 0;
+
+ scsi_strvis(vendor, sizeof(vendor), inqbuf.vendor,
+ sizeof(inqbuf.vendor));
+ scsi_strvis(product, sizeof(product), inqbuf.product,
+ sizeof(inqbuf.product));
+ scsi_strvis(revision, sizeof(revision), inqbuf.revision,
+ sizeof(inqbuf.revision));
+
+ humanize_number(size, sizeof(size),
+ (uint64_t)dd->dd_secsize * (uint64_t)dd->dd_totsec,
+ "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
+
+ snprintf(dd->dd_descr, sizeof(dd->dd_descr),
+ "%s (%s, %s
CVS commit: [netbsd-5] src/lib/libevent
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 12:55:11 UTC 2009
Modified Files:
src/lib/libevent [netbsd-5]: Makefile event.h
Log Message:
Pull up following revision(s) (requested by tls in ticket #920):
lib/libevent/Makefile: revisions 1.7, 1.8
lib/libevent/event.h: revisions 1.7
Matthias Drochner pointed out that I lost the _EVENT_ prefix from all
the autoconf defines in the installed event_config.h.
Fix this approximately as the stock libevent Makefile does.
Also, some applications written for newer libevent
want event.h to pull in event_config.h by magic.
To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/lib/libevent/Makefile
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 src/lib/libevent/event.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libevent/Makefile
diff -u src/lib/libevent/Makefile:1.4.4.2 src/lib/libevent/Makefile:1.4.4.3
--- src/lib/libevent/Makefile:1.4.4.2 Tue Aug 4 18:39:30 2009
+++ src/lib/libevent/Makefile Sat Sep 5 12:55:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.4.2 2009/08/04 18:39:30 snj Exp $
+# $NetBSD: Makefile,v 1.4.4.3 2009/09/05 12:55:11 bouyer Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
NOLINT= # Until someone explains to me how to avoid lint stupidity
@@ -11,12 +11,9 @@
SRCS= buffer.c evbuffer.c evdns.c event.c event_tagging.c evrpc.c evutil.c \
http.c kqueue.c log.c poll.c signal.c
-INCS= evdns.h event.h evhttp.h evrpc.h evutil.h
+INCS= evdns.h event.h evhttp.h evrpc.h evutil.h event-config.h
INCSDIR=/usr/include
-INCS+= config.h
-INCSNAME_config.h= event-config.h
-
MAN= evdns.3 event.3
MLINKS+=event.3 event_init.3
@@ -92,4 +89,7 @@
MLINKS+=evdns.3 evdns_search_ndots_set.3
MLINKS+=evdns.3 evdns_set_log_fn.3
+event-config.h: config.h
+ sed -e 's/#define /#define _EVENT_/' ${.ALLSRC} > ${.OBJDIR}/${.TARGET}
+
.include
Index: src/lib/libevent/event.h
diff -u src/lib/libevent/event.h:1.5.4.1 src/lib/libevent/event.h:1.5.4.2
--- src/lib/libevent/event.h:1.5.4.1 Tue Aug 4 18:32:08 2009
+++ src/lib/libevent/event.h Sat Sep 5 12:55:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: event.h,v 1.5.4.1 2009/08/04 18:32:08 snj Exp $ */
+/* $NetBSD: event.h,v 1.5.4.2 2009/09/05 12:55:11 bouyer Exp $ */
/* $OpenBSD: event.h,v 1.4 2002/07/12 18:50:48 provos Exp $ */
/*
@@ -165,6 +165,7 @@
extern "C" {
#endif
+#include
#include
#include
#include
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 12:55:05 UTC 2009
Modified Files:
src/sys/dev/pci: ahd_pci.c
Log Message:
Wrap long lines.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/ahd_pci.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/ahd_pci.c
diff -u src/sys/dev/pci/ahd_pci.c:1.28 src/sys/dev/pci/ahd_pci.c:1.29
--- src/sys/dev/pci/ahd_pci.c:1.28 Wed May 6 09:25:14 2009
+++ src/sys/dev/pci/ahd_pci.c Sat Sep 5 12:55:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ahd_pci.c,v 1.28 2009/05/06 09:25:14 cegger Exp $ */
+/* $NetBSD: ahd_pci.c,v 1.29 2009/09/05 12:55:05 tsutsui Exp $ */
/*
* Product specific probe and attach routines for:
@@ -45,11 +45,12 @@
* $FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.16 2003/06/28 04:39:49 gibbs Exp $
*/
/*
- * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
+ * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc.
+ * - April 2003
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.28 2009/05/06 09:25:14 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.29 2009/09/05 12:55:05 tsutsui Exp $");
#define AHD_PCI_IOADDR PCI_MAPREG_START /* I/O Address */
#define AHD_PCI_MEMADDR (PCI_MAPREG_START + 4) /* Mem I/O Address */
@@ -329,7 +330,8 @@
/* Keep information about the PCI bus */
bd = malloc(sizeof (struct ahd_pci_busdata), M_DEVBUF, M_NOWAIT);
if (bd == NULL) {
- aprint_error("%s: unable to allocate bus-specific data\n", ahd_name(ahd));
+ aprint_error("%s: unable to allocate bus-specific data\n",
+ ahd_name(ahd));
return;
}
memset(bd, 0, sizeof(struct ahd_pci_busdata));
@@ -360,7 +362,8 @@
ahd->int_coalescing_maxcmds = AHD_INT_COALESCING_MAXCMDS_DEFAULT;
ahd->int_coalescing_mincmds = AHD_INT_COALESCING_MINCMDS_DEFAULT;
ahd->int_coalescing_threshold = AHD_INT_COALESCING_THRESHOLD_DEFAULT;
- ahd->int_coalescing_stop_threshold = AHD_INT_COALESCING_STOP_THRESHOLD_DEFAULT;
+ ahd->int_coalescing_stop_threshold =
+ AHD_INT_COALESCING_STOP_THRESHOLD_DEFAULT;
if (ahd_platform_alloc(ahd, NULL) != 0) {
ahd_free(ahd);
@@ -1117,9 +1120,10 @@
printf("\n%s: aic7902 chip revision 0x%x\n", ahd_name(ahd), rev);
#endif
if (rev < ID_AIC7902_PCI_REV_A4) {
- aprint_error("%s: Unable to attach to unsupported chip revision %d\n",
- ahd_name(ahd), rev);
- pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, 0);
+ aprint_error("%s: Unable to attach to "
+ "unsupported chip revision %d\n", ahd_name(ahd), rev);
+ pci_conf_write(pa->pa_pc, pa->pa_tag,
+ PCI_COMMAND_STATUS_REG, 0);
return (ENXIO);
}
@@ -1175,7 +1179,8 @@
* folks!
*/
devconfig1 = pci_conf_read(pa->pa_pc, pa->pa_tag, DEVCONFIG1);
- pci_conf_write(pa->pa_pc, pa->pa_tag, DEVCONFIG1, devconfig1|PREQDIS);
+ pci_conf_write(pa->pa_pc, pa->pa_tag,
+ DEVCONFIG1, devconfig1|PREQDIS);
devconfig1 = pci_conf_read(pa->pa_pc, pa->pa_tag, DEVCONFIG1);
}
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 12:52:40 UTC 2009
Modified Files:
src/sys/dev/usb [netbsd-5]: if_cdce.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #922):
sys/dev/usb/if_cdce.c: revision 1.22
Add support for the Openmoko Freerunner to cdce(4) ported from FreeBSD.
The patch was supplied by Pierre Pronchery in PR kern/40049.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.4.1 src/sys/dev/usb/if_cdce.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.18 src/sys/dev/usb/if_cdce.c:1.18.4.1
--- src/sys/dev/usb/if_cdce.c:1.18 Wed Sep 24 07:19:18 2008
+++ src/sys/dev/usb/if_cdce.c Sat Sep 5 12:52:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.18 2008/09/24 07:19:18 ws Exp $ */
+/* $NetBSD: if_cdce.c,v 1.18.4.1 2009/09/05 12:52:40 bouyer Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.18 2008/09/24 07:19:18 ws Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.18.4.1 2009/09/05 12:52:40 bouyer Exp $");
#include "bpfilter.h"
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -154,8 +154,9 @@
usb_interface_descriptor_t *id;
usb_endpoint_descriptor_t *ed;
const usb_cdc_union_descriptor_t *ud;
+ usb_config_descriptor_t *cd;
int data_ifcno;
- int i;
+ int i, j, numalts;
u_char eaddr[ETHER_ADDR_LEN];
const usb_cdc_ethernet_descriptor_t *ue;
char eaddr_str[USB_MAX_ENCODED_STRING_LEN];
@@ -202,29 +203,61 @@
USB_ATTACH_ERROR_RETURN;
}
- /* Find endpoints. */
+ /*
+ *
+ * The Data Class interface of a networking device shall have a minimum
+ * of two interface settings. The first setting (the default interface
+ * setting) includes no endpoints and therefore no networking traffic is
+ * exchanged whenever the default interface setting is selected. One or
+ * more additional interface settings are used for normal operation, and
+ * therefore each includes a pair of endpoints (one IN, and one OUT) to
+ * exchange network traffic. Select an alternate interface setting to
+ * initialize the network aspects of the device and to enable the
+ * exchange of network traffic.
+ *
+ *
+ * Some devices, most notably cable modems, include interface settings
+ * that have no IN or OUT endpoint, therefore loop through the list of all
+ * available interface settings looking for one with both IN and OUT
+ * endpoints.
+ */
id = usbd_get_interface_descriptor(sc->cdce_data_iface);
- sc->cdce_bulkin_no = sc->cdce_bulkout_no = -1;
- for (i = 0; i < id->bNumEndpoints; i++) {
- ed = usbd_interface2endpoint_descriptor(sc->cdce_data_iface, i);
- if (!ed) {
- aprint_error_dev(self,
- "could not read endpoint descriptor\n");
+ cd = usbd_get_config_descriptor(sc->cdce_udev);
+ numalts = usbd_get_no_alts(cd, id->bInterfaceNumber);
+
+ for (j = 0; j < numalts; j++) {
+ if (usbd_set_interface(sc->cdce_data_iface, j)) {
+ aprint_error_dev(sc->cdce_dev,
+ "setting alternate interface failed\n");
USB_ATTACH_ERROR_RETURN;
}
- if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
- UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
- sc->cdce_bulkin_no = ed->bEndpointAddress;
- } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
- UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
- sc->cdce_bulkout_no = ed->bEndpointAddress;
- } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
- UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT) {
- /* XXX: CDC spec defines an interrupt pipe, but it is not
- * needed for simple host-to-host applications. */
- } else {
- aprint_error_dev(self, "unexpected endpoint\n");
+ /* Find endpoints. */
+ id = usbd_get_interface_descriptor(sc->cdce_data_iface);
+ sc->cdce_bulkin_no = sc->cdce_bulkout_no = -1;
+ for (i = 0; i < id->bNumEndpoints; i++) {
+ ed = usbd_interface2endpoint_descriptor(sc->cdce_data_iface, i);
+ if (!ed) {
+aprint_error_dev(self,
+ "could not read endpoint descriptor\n");
+USB_ATTACH_ERROR_RETURN;
+ }
+ if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
+ UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
+sc->cdce_bulkin_no = ed->bEndpointAddress;
+ } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
+ UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
+sc->cdce_bulkout_no = ed->bEndpointAddress;
+ } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
+ UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT) {
+/* XXX: CDC spec defines an interrupt pipe, but it is not
+ * needed for simple host-to-host applications. */
+ } else {
+aprint_error_dev(self, "unexpected endpoint\n");
+ }
}
+ /* If we found something, try and use it... */
+ if ((sc->cdce_bulkin
CVS commit: [netbsd-5] src/lib/libpthread
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 12:51:09 UTC 2009
Modified Files:
src/lib/libpthread [netbsd-5]: pthread_cancelstub.c pthread_misc.c
Log Message:
Pull up following revision(s) (requested by enami in ticket #921):
lib/libpthread/pthread_misc.c: revision 1.14 via patch
lib/libpthread/pthread_cancelstub.c: revision 1.27 via patch
Make nanosleep cancelable again.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.2.1 src/lib/libpthread/pthread_cancelstub.c
cvs rdiff -u -r1.10 -r1.10.4.1 src/lib/libpthread/pthread_misc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread_cancelstub.c
diff -u src/lib/libpthread/pthread_cancelstub.c:1.22 src/lib/libpthread/pthread_cancelstub.c:1.22.2.1
--- src/lib/libpthread/pthread_cancelstub.c:1.22 Wed Oct 8 08:27:07 2008
+++ src/lib/libpthread/pthread_cancelstub.c Sat Sep 5 12:51:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_cancelstub.c,v 1.22 2008/10/08 08:27:07 ad Exp $ */
+/* $NetBSD: pthread_cancelstub.c,v 1.22.2.1 2009/09/05 12:51:09 bouyer Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread_cancelstub.c,v 1.22 2008/10/08 08:27:07 ad Exp $");
+__RCSID("$NetBSD: pthread_cancelstub.c,v 1.22.2.1 2009/09/05 12:51:09 bouyer Exp $");
#ifndef lint
@@ -91,6 +91,7 @@
ssize_t _sys_msgrcv(int, void *, size_t, long, int);
int _sys_msgsnd(int, const void *, size_t, int);
int _sys___msync13(void *, size_t, int);
+int _sys_nanosleep(const struct timespec *, struct timespec *);
int _sys_open(const char *, int, ...);
int _sys_poll(struct pollfd *, nfds_t, int);
int _sys_pollts(struct pollfd *, nfds_t, const struct timespec *,
@@ -333,6 +334,24 @@
}
int
+nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
+{
+ int retval;
+ pthread_t self;
+
+ self = pthread__self();
+ TESTCANCEL(self);
+ /*
+ * For now, just nanosleep. In the future, maybe pass a ucontext_t
+ * to _lwp_nanosleep() and allow it to recycle our kernel stack.
+ */
+ retval = _sys_nanosleep(rqtp, rmtp);
+ TESTCANCEL(self);
+
+ return retval;
+}
+
+int
open(const char *path, int flags, ...)
{
int retval;
@@ -553,6 +572,7 @@
__strong_alias(_msgrcv, msgrcv)
__strong_alias(_msgsnd, msgsnd)
__strong_alias(___msync13, __msync13)
+__strong_alias(_nanosleep, nanosleep)
__strong_alias(_open, open)
__strong_alias(_poll, poll)
__weak_alias(pollts, _pollts)
Index: src/lib/libpthread/pthread_misc.c
diff -u src/lib/libpthread/pthread_misc.c:1.10 src/lib/libpthread/pthread_misc.c:1.10.4.1
--- src/lib/libpthread/pthread_misc.c:1.10 Sat Jun 28 16:50:43 2008
+++ src/lib/libpthread/pthread_misc.c Sat Sep 5 12:51:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_misc.c,v 1.10 2008/06/28 16:50:43 ad Exp $ */
+/* $NetBSD: pthread_misc.c,v 1.10.4.1 2009/09/05 12:51:09 bouyer Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread_misc.c,v 1.10 2008/06/28 16:50:43 ad Exp $");
+__RCSID("$NetBSD: pthread_misc.c,v 1.10.4.1 2009/09/05 12:51:09 bouyer Exp $");
#include
#include
@@ -50,10 +50,8 @@
int pthread__sched_yield(void);
int _sys___sigprocmask14(int, const sigset_t *, sigset_t *);
-int _sys_nanosleep(const struct timespec *, struct timespec *);
int _sys_sched_yield(void);
-__strong_alias(_nanosleep, nanosleep)
__strong_alias(__libc_thr_sigsetmask,pthread_sigmask)
__strong_alias(__sigprocmask14,pthread_sigmask)
__strong_alias(__libc_thr_yield,pthread__sched_yield)
@@ -150,19 +148,6 @@
return 0;
}
-#ifndef lint
-int
-nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
-{
-
- /*
- * For now, just nanosleep. In the future, maybe pass a ucontext_t
- * to _lwp_nanosleep() and allow it to recycle our kernel stack.
- */
- return _sys_nanosleep(rqtp, rmtp);
-}
-#endif
-
int
pthread__sched_yield(void)
{
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 12:50:53 UTC 2009
Modified Files:
src/sys/dev/ic: aic79xx_osm.c aic79xx_osm.h
Log Message:
Make ahd_detach() take struct ahd_softc * rather than device_t
as well as ahd_attach(). (currently no backend calls it though)
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/aic79xx_osm.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/aic79xx_osm.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/ic/aic79xx_osm.c
diff -u src/sys/dev/ic/aic79xx_osm.c:1.27 src/sys/dev/ic/aic79xx_osm.c:1.28
--- src/sys/dev/ic/aic79xx_osm.c:1.27 Sat Sep 5 12:46:55 2009
+++ src/sys/dev/ic/aic79xx_osm.c Sat Sep 5 12:50:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.c,v 1.27 2009/09/05 12:46:55 tsutsui Exp $ */
+/* $NetBSD: aic79xx_osm.c,v 1.28 2009/09/05 12:50:53 tsutsui Exp $ */
/*
* Bus independent NetBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.27 2009/09/05 12:46:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.28 2009/09/05 12:50:53 tsutsui Exp $");
#include
#include
@@ -804,12 +804,10 @@
}
int
-ahd_detach(device_t self, int flags)
+ahd_detach(struct ahd_softc *ahd, int flags)
{
int rv = 0;
- struct ahd_softc *ahd = device_private(self);
-
if (ahd->sc_child != NULL)
rv = config_detach(ahd->sc_child, flags);
Index: src/sys/dev/ic/aic79xx_osm.h
diff -u src/sys/dev/ic/aic79xx_osm.h:1.18 src/sys/dev/ic/aic79xx_osm.h:1.19
--- src/sys/dev/ic/aic79xx_osm.h:1.18 Wed Sep 2 17:08:12 2009
+++ src/sys/dev/ic/aic79xx_osm.h Sat Sep 5 12:50:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.h,v 1.18 2009/09/02 17:08:12 tsutsui Exp $ */
+/* $NetBSD: aic79xx_osm.h,v 1.19 2009/09/05 12:50:53 tsutsui Exp $ */
/*
* NetBSD platform specific driver option settings, data structures,
@@ -32,9 +32,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $NetBSD: aic79xx_osm.h,v 1.18 2009/09/02 17:08:12 tsutsui Exp $
+ * $NetBSD: aic79xx_osm.h,v 1.19 2009/09/05 12:50:53 tsutsui Exp $
*
- * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.18 2009/09/02 17:08:12 tsutsui Exp $
+ * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.19 2009/09/05 12:50:53 tsutsui Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.9 2003/05/26 21:43:29 gibbs Exp $
*/
@@ -549,7 +549,7 @@
int ahd_map_int(struct ahd_softc *);
int ahd_attach(struct ahd_softc *);
int ahd_softc_comp(struct ahd_softc *, struct ahd_softc *);
-int ahd_detach(device_t, int);
+int ahd_detach(struct ahd_softc *, int);
#define ahd_platform_init(arg)
CVS commit: src/external/gpl2/xcvs/dist/src
Module Name:src
Committed By: apb
Date: Sat Sep 5 12:50:33 UTC 2009
Modified Files:
src/external/gpl2/xcvs/dist/src: admin.c
Log Message:
It's expected that config will be NULL in a cvs client, but not
in a server or with a local CVSROOT.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/admin.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/xcvs/dist/src/admin.c
diff -u src/external/gpl2/xcvs/dist/src/admin.c:1.3 src/external/gpl2/xcvs/dist/src/admin.c:1.4
--- src/external/gpl2/xcvs/dist/src/admin.c:1.3 Fri Apr 10 11:20:29 2009
+++ src/external/gpl2/xcvs/dist/src/admin.c Sat Sep 5 12:50:33 2009
@@ -327,8 +327,17 @@
while ((c = getopt (argc, argv,
"+ib::c:a:A:e::l::u::LUn:N:m:o:s:t::IqxV:k:")) != -1)
{
- if (c != 'q' && !strchr (config->UserAdminOptions, c))
+ if (config != NULL) {
+ if (c != 'q' && !strchr (config->UserAdminOptions, c))
+ only_allowed_options = false;
+ } else {
+#ifdef CLIENT_SUPPORT
+ assert(current_parsed_root->isremote);
only_allowed_options = false;
+#else
+ assert(0); /* config should not be NULL, except in a client */
+#endif
+ }
switch (c)
{
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 12:46:55 UTC 2009
Modified Files:
src/sys/dev/ic: aic79xx_osm.c
Log Message:
Use device_private() to get softc.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/aic79xx_osm.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/ic/aic79xx_osm.c
diff -u src/sys/dev/ic/aic79xx_osm.c:1.26 src/sys/dev/ic/aic79xx_osm.c:1.27
--- src/sys/dev/ic/aic79xx_osm.c:1.26 Sat Sep 5 12:43:56 2009
+++ src/sys/dev/ic/aic79xx_osm.c Sat Sep 5 12:46:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.c,v 1.26 2009/09/05 12:43:56 tsutsui Exp $ */
+/* $NetBSD: aic79xx_osm.c,v 1.27 2009/09/05 12:46:55 tsutsui Exp $ */
/*
* Bus independent NetBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.26 2009/09/05 12:43:56 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.27 2009/09/05 12:46:55 tsutsui Exp $");
#include
#include
@@ -156,9 +156,11 @@
ahd_ioctl(struct scsipi_channel *channel, u_long cmd,
void *addr, int flag, struct proc *p)
{
- struct ahd_softc *ahd = (void *)channel->chan_adapter->adapt_dev;
+ struct ahd_softc *ahd;
int s, ret = ENOTTY;
+ ahd = device_private(channel->chan_adapter->adapt_dev);
+
switch (cmd) {
case SCBUSIORESET:
s = splbio();
@@ -321,7 +323,7 @@
struct ahd_initiator_tinfo *tinfo;
struct ahd_tmode_tstate *tstate;
- ahd = (void *)chan->chan_adapter->adapt_dev;
+ ahd = device_private(chan->chan_adapter->adapt_dev);
switch(req) {
@@ -537,7 +539,8 @@
xs->error = 0;
xs->status = 0;
xs->xs_status = 0;
- ahd = (void*)xs->xs_periph->periph_channel->chan_adapter->adapt_dev;
+ ahd = device_private(
+ xs->xs_periph->periph_channel->chan_adapter->adapt_dev);
scb->sg_count = 0;
if (nsegments != 0) {
@@ -805,7 +808,7 @@
{
int rv = 0;
- struct ahd_softc *ahd = (struct ahd_softc*)self;
+ struct ahd_softc *ahd = device_private(self);
if (ahd->sc_child != NULL)
rv = config_detach(ahd->sc_child, flags);
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 12:43:57 UTC 2009
Modified Files:
src/sys/dev/ic: aic79xx_osm.c
Log Message:
- use local ahd_name() to print device name
- pass proper device_t types to config(9) functions
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/aic79xx_osm.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/ic/aic79xx_osm.c
diff -u src/sys/dev/ic/aic79xx_osm.c:1.25 src/sys/dev/ic/aic79xx_osm.c:1.26
--- src/sys/dev/ic/aic79xx_osm.c:1.25 Sat Sep 5 12:39:25 2009
+++ src/sys/dev/ic/aic79xx_osm.c Sat Sep 5 12:43:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.c,v 1.25 2009/09/05 12:39:25 tsutsui Exp $ */
+/* $NetBSD: aic79xx_osm.c,v 1.26 2009/09/05 12:43:56 tsutsui Exp $ */
/*
* Bus independent NetBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.25 2009/09/05 12:39:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.26 2009/09/05 12:43:56 tsutsui Exp $");
#include
#include
@@ -78,7 +78,7 @@
char ahd_info[256];
ahd_controller_info(ahd, ahd_info, sizeof(ahd_info));
- printf("%s: %s\n", device_xname(&ahd->sc_dev), ahd_info);
+ printf("%s: %s\n", ahd_name(ahd), ahd_info);
ahd_lock(ahd, &s);
@@ -100,7 +100,7 @@
ahd->sc_channel.chan_id = ahd->our_id;
ahd->sc_channel.chan_flags |= SCSIPI_CHAN_CANGROW;
- ahd->sc_child = config_found((void *)ahd, &ahd->sc_channel, scsiprint);
+ ahd->sc_child = config_found(&ahd->sc_dev, &ahd->sc_channel, scsiprint);
ahd_intr_enable(ahd, TRUE);
@@ -808,7 +808,7 @@
struct ahd_softc *ahd = (struct ahd_softc*)self;
if (ahd->sc_child != NULL)
- rv = config_detach((void *)ahd->sc_child, flags);
+ rv = config_detach(ahd->sc_child, flags);
pmf_device_deregister(&ahd->sc_dev);
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 12:39:25 UTC 2009
Modified Files:
src/sys/dev/ic: aic79xx_inline.h aic79xx_osm.c
Log Message:
Remove unnecessary casts against void pointers.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/aic79xx_inline.h
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/aic79xx_osm.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/ic/aic79xx_inline.h
diff -u src/sys/dev/ic/aic79xx_inline.h:1.18 src/sys/dev/ic/aic79xx_inline.h:1.19
--- src/sys/dev/ic/aic79xx_inline.h:1.18 Wed Sep 2 17:08:12 2009
+++ src/sys/dev/ic/aic79xx_inline.h Sat Sep 5 12:39:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_inline.h,v 1.18 2009/09/02 17:08:12 tsutsui Exp $ */
+/* $NetBSD: aic79xx_inline.h,v 1.19 2009/09/05 12:39:25 tsutsui Exp $ */
/*
* Inline routines shareable across OS platforms.
@@ -881,7 +881,7 @@
static __inline int
ahd_intr(void *arg)
{
- struct ahd_softc *ahd = (struct ahd_softc*)arg;
+ struct ahd_softc *ahd = arg;
u_int intstat;
if ((ahd->pause & INTEN) == 0) {
Index: src/sys/dev/ic/aic79xx_osm.c
diff -u src/sys/dev/ic/aic79xx_osm.c:1.24 src/sys/dev/ic/aic79xx_osm.c:1.25
--- src/sys/dev/ic/aic79xx_osm.c:1.24 Wed Sep 2 17:11:26 2009
+++ src/sys/dev/ic/aic79xx_osm.c Sat Sep 5 12:39:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.c,v 1.24 2009/09/02 17:11:26 tsutsui Exp $ */
+/* $NetBSD: aic79xx_osm.c,v 1.25 2009/09/05 12:39:25 tsutsui Exp $ */
/*
* Bus independent NetBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.24 2009/09/02 17:11:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.25 2009/09/05 12:39:25 tsutsui Exp $");
#include
#include
@@ -181,7 +181,7 @@
{
struct ahd_softc *ahd;
- ahd = (struct ahd_softc *)arg;
+ ahd = arg;
printf("%s; ahd_platform_intr\n", ahd_name(ahd));
@@ -532,7 +532,7 @@
u_int mask;
ints;
- scb = (struct scb*)arg;
+ scb = arg;
xs = scb->xs;
xs->error = 0;
xs->status = 0;
@@ -669,7 +669,7 @@
return (EIO);
}
- ahd_intr((void *)ahd);
+ ahd_intr(ahd);
return (0);
}
@@ -739,8 +739,8 @@
ahd_mode_state saved_modes;
int s;
- scb = (struct scb *)arg;
- ahd = (struct ahd_softc *)scb->ahd_softc;
+ scb = arg;
+ ahd = scb->ahd_softc;
printf("%s: ahd_timeout\n", ahd_name(ahd));
CVS commit: src/sys/dev
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 12:31:00 UTC 2009
Modified Files:
src/sys/dev/ic: elink3.c elink3var.h
src/sys/dev/pcmcia: if_ep_pcmcia.c
Log Message:
Replace shutdownhook_establish(9) with pmf_device_register1(9) in
MI epconfig() and ep_detach(), and remove pmf(9) calls in pcmcia attachment.
Tested on ep0 at pci, but pcmcia attachment is untested.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/ic/elink3.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/elink3var.h
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pcmcia/if_ep_pcmcia.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/ic/elink3.c
diff -u src/sys/dev/ic/elink3.c:1.127 src/sys/dev/ic/elink3.c:1.128
--- src/sys/dev/ic/elink3.c:1.127 Wed Aug 27 05:33:47 2008
+++ src/sys/dev/ic/elink3.c Sat Sep 5 12:30:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.127 2008/08/27 05:33:47 christos Exp $ */
+/* $NetBSD: elink3.c,v 1.128 2009/09/05 12:30:59 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.127 2008/08/27 05:33:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.128 2009/09/05 12:30:59 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -192,7 +192,7 @@
void epstart(struct ifnet *);
void epwatchdog(struct ifnet *);
void epreset(struct ep_softc *);
-static void epshutdown(void *);
+static bool epshutdown(device_t, int);
void epread(struct ep_softc *);
struct mbuf *epget(struct ep_softc *, int);
void epmbuffill(void *);
@@ -501,7 +501,11 @@
sc->tx_start_thresh = 20; /* probably a good starting point. */
/* Establish callback to reset card when we reboot. */
- sc->sd_hook = shutdownhook_establish(epshutdown, sc);
+ if (pmf_device_register1(sc->sc_dev, NULL, NULL, epshutdown))
+ pmf_class_network_register(sc->sc_dev, ifp);
+ else
+ aprint_error_dev(sc->sc_dev,
+ "couldn't establish power handler\n");
ep_reset_cmd(sc, ELINK_COMMAND, RX_RESET);
ep_reset_cmd(sc, ELINK_COMMAND, TX_RESET);
@@ -1798,10 +1802,10 @@
/*
* Before reboots, reset card completely.
*/
-static void
-epshutdown(void *arg)
+static bool
+epshutdown(device_t self, int howto)
{
- struct ep_softc *sc = arg;
+ struct ep_softc *sc = device_private(self);
int s = splnet();
if (sc->enabled) {
@@ -1811,6 +1815,8 @@
sc->enabled = 0;
}
splx(s);
+
+ return true;
}
/*
@@ -2050,7 +2056,7 @@
ether_ifdetach(ifp);
if_detach(ifp);
- shutdownhook_disestablish(sc->sd_hook);
+ pmf_device_deregister(sc->sc_dev);
return (0);
}
Index: src/sys/dev/ic/elink3var.h
diff -u src/sys/dev/ic/elink3var.h:1.35 src/sys/dev/ic/elink3var.h:1.36
--- src/sys/dev/ic/elink3var.h:1.35 Wed Aug 27 05:33:47 2008
+++ src/sys/dev/ic/elink3var.h Sat Sep 5 12:30:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3var.h,v 1.35 2008/08/27 05:33:47 christos Exp $ */
+/* $NetBSD: elink3var.h,v 1.36 2009/09/05 12:30:59 tsutsui Exp $ */
/*
* Copyright (c) 1994 Herb Peyerl
@@ -105,8 +105,6 @@
rndsource_element_t rnd_source;
#endif
- void *sd_hook;
-
/* power management hooks */
int (*enable)(struct ep_softc *);
void (*disable)(struct ep_softc *);
Index: src/sys/dev/pcmcia/if_ep_pcmcia.c
diff -u src/sys/dev/pcmcia/if_ep_pcmcia.c:1.62 src/sys/dev/pcmcia/if_ep_pcmcia.c:1.63
--- src/sys/dev/pcmcia/if_ep_pcmcia.c:1.62 Wed Aug 27 05:33:47 2008
+++ src/sys/dev/pcmcia/if_ep_pcmcia.c Sat Sep 5 12:31:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pcmcia.c,v 1.62 2008/08/27 05:33:47 christos Exp $ */
+/* $NetBSD: if_ep_pcmcia.c,v 1.63 2009/09/05 12:31:00 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.62 2008/08/27 05:33:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.63 2009/09/05 12:31:00 tsutsui Exp $");
#include
#include
@@ -322,11 +322,6 @@
if (epconfig(sc, epp->epp_chipset, enaddr))
aprint_error_dev(self, "couldn't configure controller\n");
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- else
- pmf_class_network_register(self, &sc->sc_ethercom.ec_if);
-
sc->enabled = 0;
ep_pcmcia_disable(sc);
return;
@@ -349,8 +344,6 @@
/* Nothing to detach. */
return 0;
- pmf_device_deregister(self);
-
rv = ep_detach(self, flags);
if (rv != 0)
return rv;
CVS commit: src/usr.bin/sort
Module Name:src
Committed By: dsl
Date: Sat Sep 5 12:00:26 UTC 2009
Modified Files:
src/usr.bin/sort: append.c files.c fsort.c fsort.h msort.c radix_sort.c
sort.h
Log Message:
Now we have our own radix_sort() change the interface so that we pass
an array of 'RECHEADER *' and remove all the crappy stuff that backed up
by REC_DATA_OFFSET (etc).
Also change radix_sort() to return the number of elements, soon to be used
to drop duplicate keys (for sort -u).
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/sort/append.c
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/sort/files.c
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/sort/fsort.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/sort/fsort.h
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/sort/msort.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/sort/radix_sort.c
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/sort/sort.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sort/append.c
diff -u src/usr.bin/sort/append.c:1.20 src/usr.bin/sort/append.c:1.21
--- src/usr.bin/sort/append.c:1.20 Sat Aug 22 10:53:28 2009
+++ src/usr.bin/sort/append.c Sat Sep 5 12:00:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: append.c,v 1.20 2009/08/22 10:53:28 dsl Exp $ */
+/* $NetBSD: append.c,v 1.21 2009/09/05 12:00:25 dsl Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include "sort.h"
#ifndef lint
-__RCSID("$NetBSD: append.c,v 1.20 2009/08/22 10:53:28 dsl Exp $");
+__RCSID("$NetBSD: append.c,v 1.21 2009/09/05 12:00:25 dsl Exp $");
__SCCSID("@(#)append.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@@ -88,16 +88,16 @@
* copy sorted lines to output; check for uniqueness
*/
void
-append(const u_char **keylist, int nelem, FILE *fp, put_func_t put, u_char *wts)
+append(const RECHEADER **keylist, int nelem, FILE *fp, put_func_t put, u_char *wts)
{
- const u_char **cpos, **lastkey;
- const struct recheader *crec, *prec;
+ const RECHEADER **cpos, **lastkey;
+ const RECHEADER *crec, *prec;
size_t plen;
lastkey = keylist + nelem;
if (!UNIQUE || wts == NULL) {
for (cpos = keylist; cpos < lastkey; cpos++)
- put((const RECHEADER *)(*cpos - REC_DATA_OFFSET), fp);
+ put(*cpos, fp);
return;
}
@@ -105,13 +105,13 @@
return;
cpos = keylist;
- prec = (const RECHEADER *) (*cpos - REC_DATA_OFFSET);
+ prec = *cpos;
if (!SINGL_FLD) {
/* Key for each line is already in adjacent bytes */
plen = prec->offset;
for (cpos = &keylist[1]; cpos < lastkey; cpos++) {
- crec = (const RECHEADER *) (*cpos - REC_DATA_OFFSET);
+ crec = *cpos;
if (crec->offset == plen
&& memcmp(crec->data, prec->data, plen) == 0) {
/* Duplicate key */
@@ -130,7 +130,7 @@
/* Key for each line is already in adjacent bytes */
plen = prec->length;
for (cpos = &keylist[1]; cpos < lastkey; cpos++) {
- crec = (const RECHEADER *) (*cpos - REC_DATA_OFFSET);
+ crec = *cpos;
if (crec->length == plen
&& wt_cmp(crec->data, prec->data, plen, wts) == 0) {
/* Duplicate key */
Index: src/usr.bin/sort/files.c
diff -u src/usr.bin/sort/files.c:1.35 src/usr.bin/sort/files.c:1.36
--- src/usr.bin/sort/files.c:1.35 Sat Aug 22 10:53:28 2009
+++ src/usr.bin/sort/files.c Sat Sep 5 12:00:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: files.c,v 1.35 2009/08/22 10:53:28 dsl Exp $ */
+/* $NetBSD: files.c,v 1.36 2009/09/05 12:00:25 dsl Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include "fsort.h"
#ifndef lint
-__RCSID("$NetBSD: files.c,v 1.35 2009/08/22 10:53:28 dsl Exp $");
+__RCSID("$NetBSD: files.c,v 1.36 2009/09/05 12:00:25 dsl Exp $");
__SCCSID("@(#)files.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@@ -271,7 +271,7 @@
void
putrec(const RECHEADER *rec, FILE *fp)
{
- EWRITE(rec, 1, rec->length + REC_DATA_OFFSET, fp);
+ EWRITE(rec, 1, offsetof(RECHEADER, data) + rec->length, fp);
}
/*
@@ -289,7 +289,7 @@
void
putkeydump(const RECHEADER *rec, FILE *fp)
{
- EWRITE(rec, 1, rec->offset + REC_DATA_OFFSET, fp);
+ EWRITE(rec, 1, offsetof(RECHEADER, data) + rec->offset, fp);
}
/*
@@ -303,15 +303,15 @@
FILE *fp;
fp = fstack[flno].fp;
- if ((u_char *) rec > end - REC_DATA_OFFSET)
+ if ((u_char *)(rec + 1) > end)
return (BUFFEND);
- if (!fread(rec, 1, REC_DATA_OFFSET, fp)) {
+ if (!fread(rec, 1, offsetof(RECHEADER, data), fp)) {
fclose(fp);
fstack[flno].fp = 0;
return (EOF);
}
if (end - rec->data < (ptrdiff_t)rec->length) {
- for (i = REC_DATA_OFFSET - 1; i >= 0; i--)
+ for (i = offsetof(RECHEADER, data) - 1; i >= 0; i--)
ungetc(*((char *) rec + i), fp);
return (BUFFEND);
}
Index: src/usr.bin/sort/fsort.c
diff -u src/usr.bin/sort/fsort.c:1.39 src/usr.bin/sort/fsort.c:1.40
--- src/usr.bin/sort/fsort.c:1.39 Sat Aug 22 10:53:28 2009
+++ src/usr.bin/sort/fsort.c Sat Sep 5 12:00:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fsort.c,v 1.39
CVS commit: [netbsd-5-0] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:46:58 UTC 2009
Modified Files:
src/doc [netbsd-5-0]: CHANGES-5.0.2
Log Message:
tickets 902, 914
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-5.0.2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.0.2
diff -u src/doc/CHANGES-5.0.2:1.1.2.8 src/doc/CHANGES-5.0.2:1.1.2.9
--- src/doc/CHANGES-5.0.2:1.1.2.8 Sun Aug 30 02:51:25 2009
+++ src/doc/CHANGES-5.0.2 Sat Sep 5 11:46:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.2,v 1.1.2.8 2009/08/30 02:51:25 snj Exp $
+# $NetBSD: CHANGES-5.0.2,v 1.1.2.9 2009/09/05 11:46:58 bouyer Exp $
A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2
release:
@@ -188,3 +188,17 @@
Update and add some TNF ssh keys.
[spz, ticket #930]
+lib/libc/stdio/vfwprintf.c 1.16
+
+ If the current locale doesn't define the 'thousands' grouping info
+ then use sane defaults (',' every 3 digits).
+ Fixes PR/40714
+ [dsl, ticket #902]
+
+sbin/fsck_ext2fs/main.c1.33
+
+ Ignore the "-P" option as intended to make this work with e.g.
+ "fsck_flags=3D-pP" in "/etc/rc.conf".
+ Patch supplied by Pierre Pronchery in PR bin/41490.
+ [tron, ticket #914]
+
CVS commit: [netbsd-5] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:46:29 UTC 2009
Modified Files:
src/doc [netbsd-5]: CHANGES-5.1
Log Message:
tickets 896, 900, 901, 902, 911, 914
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-5.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.63 src/doc/CHANGES-5.1:1.1.2.64
--- src/doc/CHANGES-5.1:1.1.2.63 Sun Aug 30 03:08:11 2009
+++ src/doc/CHANGES-5.1 Sat Sep 5 11:46:29 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.63 2009/08/30 03:08:11 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.64 2009/09/05 11:46:29 bouyer Exp $
A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
release:
@@ -2286,3 +2286,59 @@
- Add detach method
[jmcneill, ticket #891]
+sys/dev/acpi/acpi.c1.127 via patch
+sys/dev/acpi/acpi_button.c 1.27 via patch
+sys/dev/acpi/acpi_lid.c1.27 via patch
+sys/dev/acpi/acpi_wakedev.c 1.1 via patch
+sys/dev/acpi/acpi_wakedev.h 1.1 via patch
+sys/dev/acpi/files.acpi1.55 via patch
+
+ add hw.wake.* sysctl subtree for toggling which devices are allowed to
+ restore the system from sleep. set/clear wake GPEs as specified before
+ entering sleep.
+
+ by default, the following devices are enabled for wake:
+ - sleep/power buttons
+ - lid switch
+ - pc kbd controller
+
+ reviewed by: joerg
+ [jmcneill, ticket #896]
+
+sys/kern/vfs_lockf.c1.72
+
+ lockf() passes its arguments through to fcntl() but is supposed to
+ support -ve lengths (lock area before current offset).
+ Nothing in libc or the kernel allowed for this, so some random part
+ of the file would get locked (no idea which bits).
+ This also fixes PR/41620 (attempting to lock negative offsets).
+ [dsl, ticket #900]
+
+sys/kern/kern_ktrace.c1.149
+
+ Fix ktrace of data from iovec based system calls.
+ Fixes PR/41819
+ [dsl, ticket #901]
+
+lib/libc/stdio/vfwprintf.c 1.16
+
+ If the current locale doesn't define the 'thousands' grouping info
+ then use sane defaults (',' every 3 digits).
+ Fixes PR/40714
+ [dsl, ticket #902]
+
+sys/netinet/if_arp.c1.146
+
+ Don't require the gateway address to have room for both an interface
+ name and address. Room for an address will do. This should fix
+ a regression in 'arp -s ...' on interfaces such as xennet0 with
+ unusually long names. Fix PR #41878.
+ [dyoung, ticket #911]
+
+sbin/fsck_ext2fs/main.c1.33
+
+ Ignore the "-P" option as intended to make this work with e.g.
+ "fsck_flags=3D-pP" in "/etc/rc.conf".
+ Patch supplied by Pierre Pronchery in PR bin/41490.
+ [tron, ticket #914]
+
CVS commit: [netbsd-5-0] src/sbin/fsck_ext2fs
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:45:20 UTC 2009
Modified Files:
src/sbin/fsck_ext2fs [netbsd-5-0]: main.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #914):
sbin/fsck_ext2fs/main.c: revision 1.33
Ignore the "-P" option as intended to make this work with e.g.
"fsck_flags=3D-pP" in "/etc/rc.conf".
Patch supplied by Pierre Pronchery in PR bin/41490.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.6.1 src/sbin/fsck_ext2fs/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ext2fs/main.c
diff -u src/sbin/fsck_ext2fs/main.c:1.32 src/sbin/fsck_ext2fs/main.c:1.32.6.1
--- src/sbin/fsck_ext2fs/main.c:1.32 Sun Oct 12 20:49:43 2008
+++ src/sbin/fsck_ext2fs/main.c Sat Sep 5 11:45:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.32 2008/10/12 20:49:43 wiz Exp $ */
+/* $NetBSD: main.c,v 1.32.6.1 2009/09/05 11:45:20 bouyer Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94";
#else
-__RCSID("$NetBSD: main.c,v 1.32 2008/10/12 20:49:43 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.32.6.1 2009/09/05 11:45:20 bouyer Exp $");
#endif
#endif /* not lint */
@@ -107,7 +107,7 @@
sync();
skipclean = 1;
- while ((ch = getopt(argc, argv, "b:dfm:npqUy")) != -1) {
+ while ((ch = getopt(argc, argv, "b:dfm:npPqUy")) != -1) {
switch (ch) {
case 'b':
skipclean = 0;
CVS commit: [netbsd-5] src/sbin/fsck_ext2fs
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:45:06 UTC 2009
Modified Files:
src/sbin/fsck_ext2fs [netbsd-5]: main.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #914):
sbin/fsck_ext2fs/main.c: revision 1.33
Ignore the "-P" option as intended to make this work with e.g.
"fsck_flags=3D-pP" in "/etc/rc.conf".
Patch supplied by Pierre Pronchery in PR bin/41490.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/sbin/fsck_ext2fs/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ext2fs/main.c
diff -u src/sbin/fsck_ext2fs/main.c:1.32 src/sbin/fsck_ext2fs/main.c:1.32.2.1
--- src/sbin/fsck_ext2fs/main.c:1.32 Sun Oct 12 20:49:43 2008
+++ src/sbin/fsck_ext2fs/main.c Sat Sep 5 11:45:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.32 2008/10/12 20:49:43 wiz Exp $ */
+/* $NetBSD: main.c,v 1.32.2.1 2009/09/05 11:45:06 bouyer Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94";
#else
-__RCSID("$NetBSD: main.c,v 1.32 2008/10/12 20:49:43 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.32.2.1 2009/09/05 11:45:06 bouyer Exp $");
#endif
#endif /* not lint */
@@ -107,7 +107,7 @@
sync();
skipclean = 1;
- while ((ch = getopt(argc, argv, "b:dfm:npqUy")) != -1) {
+ while ((ch = getopt(argc, argv, "b:dfm:npPqUy")) != -1) {
switch (ch) {
case 'b':
skipclean = 0;
CVS commit: [netbsd-5] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:44:07 UTC 2009
Modified Files:
src/sys/netinet [netbsd-5]: if_arp.c
Log Message:
Pull up following revision(s) (requested by dyoung in ticket #911):
sys/netinet/if_arp.c: revision 1.146
Don't require the gateway address to have room for both an interface
name and address. Room for an address will do. This should fix
a regression in 'arp -s ...' on interfaces such as xennet0 with
unusually long names. Fix PR #41878.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.143.4.1 src/sys/netinet/if_arp.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/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.143 src/sys/netinet/if_arp.c:1.143.4.1
--- src/sys/netinet/if_arp.c:1.143 Fri Oct 24 17:07:33 2008
+++ src/sys/netinet/if_arp.c Sat Sep 5 11:44:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.143 2008/10/24 17:07:33 dyoung Exp $ */
+/* $NetBSD: if_arp.c,v 1.143.4.1 2009/09/05 11:44:07 bouyer Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.143 2008/10/24 17:07:33 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.143.4.1 2009/09/05 11:44:07 bouyer Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -459,8 +459,6 @@
struct in_ifaddr *ia;
struct ifaddr *ifa;
struct ifnet *ifp = rt->rt_ifp;
- uint8_t namelen = strlen(ifp->if_xname);
- uint8_t addrlen = ifp->if_addrlen;
if (!arpinit_done) {
arpinit_done = 1;
@@ -567,7 +565,7 @@
/*FALLTHROUGH*/
case RTM_RESOLVE:
if (gate->sa_family != AF_LINK ||
- gate->sa_len < sockaddr_dl_measure(namelen, addrlen)) {
+ gate->sa_len < sockaddr_dl_measure(0, ifp->if_addrlen)) {
log(LOG_DEBUG, "arp_rtrequest: bad gateway value\n");
break;
}
@@ -579,7 +577,7 @@
* Case 2: This route may come from cloning, or a manual route
* add with a LL address.
*/
- switch (satocsdl(gate)->sdl_type) {
+ switch (ifp->if_type) {
#if NTOKEN > 0
case IFT_ISO88025:
allocsize = sizeof(*la) + sizeof(struct token_rif);
@@ -622,8 +620,12 @@
* interface.
*/
rt->rt_expire = 0;
- (void)sockaddr_dl_setaddr(satosdl(gate), gate->sa_len,
- CLLADDR(ifp->if_sadl), ifp->if_addrlen);
+ if (sockaddr_dl_init(satosdl(gate), gate->sa_len,
+ ifp->if_index, ifp->if_type, NULL, 0,
+ CLLADDR(ifp->if_sadl), ifp->if_addrlen) == NULL) {
+panic("%s(%s): sockaddr_dl_init cannot fail",
+__func__, ifp->if_xname);
+ }
if (useloopback)
ifp = rt->rt_ifp = lo0ifp;
/*
CVS commit: [netbsd-5-0] src/lib/libc/stdio
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:40:11 UTC 2009
Modified Files:
src/lib/libc/stdio [netbsd-5-0]: vfwprintf.c
Log Message:
Pull up following revision(s) (requested by dsl in ticket #902):
lib/libc/stdio/vfwprintf.c: revision 1.16
If the current locale doesn't define the 'thousands' grouping info
then use sane defaults (',' every 3 digits).
Fixes PR/40714
To generate a diff of this commit:
cvs rdiff -u -r1.13.4.1 -r1.13.4.1.2.1 src/lib/libc/stdio/vfwprintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.13.4.1 src/lib/libc/stdio/vfwprintf.c:1.13.4.1.2.1
--- src/lib/libc/stdio/vfwprintf.c:1.13.4.1 Wed Feb 25 03:24:14 2009
+++ src/lib/libc/stdio/vfwprintf.c Sat Sep 5 11:40:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.13.4.1 2009/02/25 03:24:14 snj Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.13.4.1.2.1 2009/09/05 11:40:11 bouyer Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.13.4.1 2009/02/25 03:24:14 snj Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.13.4.1.2.1 2009/09/05 11:40:11 bouyer Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -897,6 +897,12 @@
flags |= GROUPING;
thousands_sep = *(localeconv()->thousands_sep);
grouping = localeconv()->grouping;
+ /* If the locale doesn't define the above, use sane
+ * defaults - otherwise silly things happen! */
+ if (thousands_sep == 0)
+thousands_sep = ',';
+ if (!grouping || !*grouping)
+grouping = "\3";
goto rflag;
case '.':
if ((ch = *fmt++) == '*') {
CVS commit: [netbsd-5] src/lib/libc/stdio
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:38:33 UTC 2009
Modified Files:
src/lib/libc/stdio [netbsd-5]: vfwprintf.c
Log Message:
Pull up following revision(s) (requested by dsl in ticket #902):
lib/libc/stdio/vfwprintf.c: revision 1.16
If the current locale doesn't define the 'thousands' grouping info
then use sane defaults (',' every 3 digits).
Fixes PR/40714
To generate a diff of this commit:
cvs rdiff -u -r1.13.4.1 -r1.13.4.2 src/lib/libc/stdio/vfwprintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.13.4.1 src/lib/libc/stdio/vfwprintf.c:1.13.4.2
--- src/lib/libc/stdio/vfwprintf.c:1.13.4.1 Wed Feb 25 03:24:14 2009
+++ src/lib/libc/stdio/vfwprintf.c Sat Sep 5 11:38:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.13.4.1 2009/02/25 03:24:14 snj Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.13.4.2 2009/09/05 11:38:33 bouyer Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.13.4.1 2009/02/25 03:24:14 snj Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.13.4.2 2009/09/05 11:38:33 bouyer Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -897,6 +897,12 @@
flags |= GROUPING;
thousands_sep = *(localeconv()->thousands_sep);
grouping = localeconv()->grouping;
+ /* If the locale doesn't define the above, use sane
+ * defaults - otherwise silly things happen! */
+ if (thousands_sep == 0)
+thousands_sep = ',';
+ if (!grouping || !*grouping)
+grouping = "\3";
goto rflag;
case '.':
if ((ch = *fmt++) == '*') {
CVS commit: src/share/man/man8
Module Name:src Committed By: wiz Date: Sat Sep 5 11:37:53 UTC 2009 Modified Files: src/share/man/man8/man8.amiga: boot.8 src/share/man/man8/man8.atari: boot.8 src/share/man/man8/man8.mac68k: boot.8 src/share/man/man8/man8.pmax: boot.8 src/share/man/man8/man8.vax: boot.8 src/share/man/man8/man8.x68k: boot.8 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man8/man8.amiga/boot.8 cvs rdiff -u -r1.12 -r1.13 src/share/man/man8/man8.atari/boot.8 cvs rdiff -u -r1.9 -r1.10 src/share/man/man8/man8.mac68k/boot.8 cvs rdiff -u -r1.14 -r1.15 src/share/man/man8/man8.pmax/boot.8 cvs rdiff -u -r1.11 -r1.12 src/share/man/man8/man8.vax/boot.8 cvs rdiff -u -r1.13 -r1.14 src/share/man/man8/man8.x68k/boot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/man8.amiga/boot.8 diff -u src/share/man/man8/man8.amiga/boot.8:1.11 src/share/man/man8/man8.amiga/boot.8:1.12 --- src/share/man/man8/man8.amiga/boot.8:1.11 Thu Aug 7 10:31:22 2003 +++ src/share/man/man8/man8.amiga/boot.8 Sat Sep 5 11:37:52 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot.8,v 1.11 2003/08/07 10:31:22 agc Exp $ +.\" $NetBSD: boot.8,v 1.12 2009/09/05 11:37:52 wiz Exp $ .\" .\" Copyright (c) 1990, 1991 The Regents of the University of California. .\" All rights reserved. @@ -46,20 +46,22 @@ When the .Nx kernel is booted normally (using one of the two methods discussed below), -it initializes itself and proceeds to boot the system. An automatic -consistency check of the file systems takes place, and unless this -fails, the system comes up to multi-user operations. The proper way -to shut the system down is with the +it initializes itself and proceeds to boot the system. +An automatic consistency check of the file systems takes place, +and unless this fails, the system comes up to multi-user operations. +The proper way to shut the system down is with the .Xr shutdown 8 command. .Pp If the system crashes, it will enter the kernel debugger, .Xr ddb 4 , -if it is configured in the kernel. If the debugger is not present, +if it is configured in the kernel. +If the debugger is not present, or the debugger is exited, the system will attempt a dump to the configured dump device (which will be automatically recovered with .Xr savecore 8 -during the next boot cycle). After the dump is complete (successful +during the next boot cycle). +After the dump is complete (successful or not), the system will attempt a reboot. .Ss Booting NetBSD using the bootloader When a bootable @@ -74,10 +76,13 @@ partition is selected by means of the boot menu, the Amiga ROM will automatically start the .Nx -bootloader. By default it will, after a short timeout, load the kernel image +bootloader. +By default it will, after a short timeout, load the kernel image .Pa /netbsd -and attempt to boot it into multi-user mode. This behaviour can be changed by -typing in an alternate command sequence. The command line looks like: +and attempt to boot it into multi-user mode. +This behaviour can be changed by +typing in an alternate command sequence. +The command line looks like: .Bd -ragged -offset indent .Ar kernel-path .Op Fl abknpqstvADZ @@ -131,8 +136,10 @@ .Ar mask is a bitmap expressed in C notation (e.g., 0xff) with 4*8bits, each bit, if set to 1, disabling sync negotiation for -the corresponding target. Note that this only applies to (some of the) -real SCSI busses, but not, e.g., to internal IDE. The bytes are used up +the corresponding target. +Note that this only applies to (some of the) +real SCSI busses, but not, e.g., to internal IDE. +The bytes are used up from right to left by SCSI bus drivers using this convention. .It Fl S Load the kernel symbols @@ -187,27 +194,33 @@ .It Fl A enable AGA modes. .It Fl D -Enter the kernel debugger after booting. Best with -S. +Enter the kernel debugger after booting. +Best with +.Fl S . .It Fl I Ar mask inhibit sync negotiation as follows: The .Ar mask is a bitmap expressed in hexadecimal (e.g., ff) with 4*8bits, each bit, if set to 1, disabling sync negotiation for -the corresponding target. Note that this only applies to (some of the) -real SCSI busses, but not, e.g., to internal IDE. The bytes are used up +the corresponding target. +Note that this only applies to (some of the) +real SCSI busses, but not, e.g., to internal IDE. +The bytes are used up from right to left by SCSI bus drivers using this convention. .It Fl S include kernel debug symbols (for use by -D). .It Fl Z -Force load via chip memory. Won't work if kernel is larger than the chip -memory size or on the DraCo. +Force load via chip memory. +Won't work if kernel is larger than the chip memory size or on the +DraCo. .El .Pp Note: Because the loadbsd program can only read kernels from a AmigaOS filesystem, the fi
CVS commit: [netbsd-5] src/sys/kern
Module Name:src Committed By: bouyer Date: Sat Sep 5 11:37:21 UTC 2009 Modified Files: src/sys/kern [netbsd-5]: kern_ktrace.c Log Message: Pull up following revision(s) (requested by dsl in ticket #901): sys/kern/kern_ktrace.c: revision 1.149 Fix ktrace of data from iovec based system calls. Fixes PR/41819 To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.147.4.1 src/sys/kern/kern_ktrace.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_ktrace.c diff -u src/sys/kern/kern_ktrace.c:1.147 src/sys/kern/kern_ktrace.c:1.147.4.1 --- src/sys/kern/kern_ktrace.c:1.147 Wed Oct 15 06:51:20 2008 +++ src/sys/kern/kern_ktrace.c Sat Sep 5 11:37:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_ktrace.c,v 1.147 2008/10/15 06:51:20 wrstuden Exp $ */ +/* $NetBSD: kern_ktrace.c,v 1.147.4.1 2009/09/05 11:37:21 bouyer Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.147 2008/10/15 06:51:20 wrstuden Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.147.4.1 2009/09/05 11:37:21 bouyer Exp $"); #include #include @@ -664,7 +664,7 @@ struct ktrace_entry *kte; struct ktr_genio *ktp; size_t resid = len, cnt, buflen; - void *cp; + char *cp; next: buflen = min(PAGE_SIZE, resid + sizeof(struct ktr_genio)); @@ -684,6 +684,7 @@ if (copyin(iov->iov_base, cp, cnt) != 0) goto out; kte->kte_kth.ktr_len += cnt; + cp += cnt; buflen -= cnt; resid -= cnt; iov->iov_len -= cnt;
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:36:29 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: vfs_lockf.c
Log Message:
Pull up following revision(s) (requested by dsl in ticket #900):
sys/kern/vfs_lockf.c: revision 1.72
lockf() passes its arguments through to fcntl() but is supposed to
support -ve lengths (lock area before current offset).
Nothing in libc or the kernel allowed for this, so some random part
of the file would get locked (no idea which bits).
Although this could probably be fixed in libc, the stubs for posix file
locks for emulations could easily get into the kernel with -ve lengths.
So fixing in the kernel avoids those problems.
This also fixes PR/41620 (attempting to lock negative offsets) - which
is what I was looking into!
To generate a diff of this commit:
cvs rdiff -u -r1.69.4.2 -r1.69.4.3 src/sys/kern/vfs_lockf.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/vfs_lockf.c
diff -u src/sys/kern/vfs_lockf.c:1.69.4.2 src/sys/kern/vfs_lockf.c:1.69.4.3
--- src/sys/kern/vfs_lockf.c:1.69.4.2 Wed Jul 1 22:49:43 2009
+++ src/sys/kern/vfs_lockf.c Sat Sep 5 11:36:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lockf.c,v 1.69.4.2 2009/07/01 22:49:43 snj Exp $ */
+/* $NetBSD: vfs_lockf.c,v 1.69.4.3 2009/09/05 11:36:29 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_lockf.c,v 1.69.4.2 2009/07/01 22:49:43 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lockf.c,v 1.69.4.3 2009/09/05 11:36:29 bouyer Exp $");
#include
#include
@@ -835,6 +835,18 @@
default:
return EINVAL;
}
+
+ if (fl->l_len == 0)
+ end = -1;
+ else {
+ if (fl->l_len > 0)
+ end = start + fl->l_len - 1;
+ else {
+ /* lockf() allows -ve lengths */
+ end = start - 1;
+ start += fl->l_len;
+ }
+ }
if (start < 0)
return EINVAL;
@@ -869,11 +881,6 @@
return EINVAL;
}
- if (fl->l_len == 0)
- end = -1;
- else
- end = start + fl->l_len - 1;
-
switch (ap->a_op) {
case F_SETLK:
lock = lf_alloc(1);
@@ -922,7 +929,7 @@
if (lock->lf_flags & F_POSIX) {
KASSERT(curproc == (struct proc *)ap->a_id);
}
- lock->lf_id = (struct proc *)ap->a_id;
+ lock->lf_id = ap->a_id;
/*
* Do the requested operation.
CVS commit: [netbsd-5] src/sys/dev/acpi
Module Name:src
Committed By: bouyer
Date: Sat Sep 5 11:34:26 UTC 2009
Modified Files:
src/sys/dev/acpi [netbsd-5]: acpi.c acpi_button.c acpi_lid.c files.acpi
Added Files:
src/sys/dev/acpi [netbsd-5]: acpi_wakedev.c acpi_wakedev.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #896):
sys/dev/acpi/acpi_button.c: revision 1.27 via patch
sys/dev/acpi/acpi_wakedev.h: revision 1.1 via patch
sys/dev/acpi/acpi_wakedev.c: revision 1.1 via patch
sys/dev/acpi/files.acpi: revision 1.55 via patch
sys/dev/acpi/acpi.c: revision 1.127 via patch
sys/dev/acpi/acpi_lid.c: revision 1.27 via patch
add hw.wake.* sysctl subtree for toggling which devices are allowed to
restore the system from sleep. set/clear wake GPEs as specified before
entering sleep.
by default, the following devices are enabled for wake:
- sleep/power buttons
- lid switch
- pc kbd controller
reviewed by: joerg
To generate a diff of this commit:
cvs rdiff -u -r1.120.4.1 -r1.120.4.2 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.25 -r1.25.24.1 src/sys/dev/acpi/acpi_button.c
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r0 -r1.2.4.2 src/sys/dev/acpi/acpi_wakedev.c
cvs rdiff -u -r0 -r1.1.4.2 src/sys/dev/acpi/acpi_wakedev.h
cvs rdiff -u -r1.52.8.1 -r1.52.8.2 src/sys/dev/acpi/files.acpi
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.c
diff -u src/sys/dev/acpi/acpi.c:1.120.4.1 src/sys/dev/acpi/acpi.c:1.120.4.2
--- src/sys/dev/acpi/acpi.c:1.120.4.1 Mon Feb 2 20:37:34 2009
+++ src/sys/dev/acpi/acpi.c Sat Sep 5 11:34:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.120.4.1 2009/02/02 20:37:34 snj Exp $ */
+/* $NetBSD: acpi.c,v 1.120.4.2 2009/09/05 11:34:26 bouyer Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.120.4.1 2009/02/02 20:37:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.120.4.2 2009/09/05 11:34:26 bouyer Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -89,6 +89,7 @@
#include
#include
#include
+#include
#ifdef ACPIVERBOSE
#include
#endif
@@ -669,6 +670,8 @@
"acpinodebus", &aa, acpi_print);
}
}
+ acpi_wakedev_scan(sc);
+
config_found_ia(sc->sc_dev, "acpiapmbus", NULL, NULL);
}
@@ -1265,6 +1268,8 @@
break;
}
+ acpi_wakedev_commit(sc);
+
if (state != ACPI_STATE_S1 && !pmf_system_suspend(PMF_F_NONE)) {
aprint_error_dev(sc->sc_dev, "aborting suspend\n");
break;
Index: src/sys/dev/acpi/acpi_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.25 src/sys/dev/acpi/acpi_button.c:1.25.24.1
--- src/sys/dev/acpi/acpi_button.c:1.25 Sun Dec 9 20:27:52 2007
+++ src/sys/dev/acpi/acpi_button.c Sat Sep 5 11:34:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.25 2007/12/09 20:27:52 jmcneill Exp $ */
+/* $NetBSD: acpi_button.c,v 1.25.24.1 2009/09/05 11:34:26 bouyer Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.25 2007/12/09 20:27:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.25.24.1 2009/09/05 11:34:26 bouyer Exp $");
#include
#include
@@ -145,8 +145,6 @@
return;
}
- acpi_set_wake_gpe(sc->sc_node->ad_handle);
-
#ifdef ACPI_BUT_DEBUG
/* Display the current state when it changes. */
sc->sc_flags = ACPIBUT_F_VERBOSE;
Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.26 src/sys/dev/acpi/acpi_lid.c:1.26.4.1
--- src/sys/dev/acpi/acpi_lid.c:1.26 Tue Jul 15 16:19:37 2008
+++ src/sys/dev/acpi/acpi_lid.c Sat Sep 5 11:34:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.26 2008/07/15 16:19:37 dyoung Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.26.4.1 2009/09/05 11:34:26 bouyer Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.26 2008/07/15 16:19:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.26.4.1 2009/09/05 11:34:26 bouyer Exp $");
#include
#include
@@ -124,8 +124,6 @@
return;
}
- acpi_set_wake_gpe(sc->sc_node->ad_handle);
-
if (!pmf_device_register(self, acpilid_suspend, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
}
@@ -136,8 +134,6 @@
struct acpilid_softc *sc = device_private(self);
ACPI_STATUS rv;
- acpi_clear_wake_gpe(sc->sc_node->ad_handle);
-
rv = AcpiRemoveNotifyHandler(sc->sc_node->ad_handle,
ACPI_DEVICE_NOTIFY, acpilid_notify_handler);
if (ACPI_FAILURE(rv)) {
Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.52.8.1 src/sys/dev/acpi/files.acpi:1.52.8.2
--- src/sys/dev/acpi/files.acpi:1.52.8.1 Sun Aug 30 03:01:26 2009
+++ src/sys/dev/acpi/files.acpi Sat Sep 5 11:34:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Sep 5 11:32:36 UTC 2009 Modified Files: src/share/man/man9: boothowto.9 Log Message: Various fixes; be more kind to mdoclint. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/boothowto.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/boothowto.9 diff -u src/share/man/man9/boothowto.9:1.1 src/share/man/man9/boothowto.9:1.2 --- src/share/man/man9/boothowto.9:1.1 Fri Sep 4 23:23:05 2009 +++ src/share/man/man9/boothowto.9 Sat Sep 5 11:32:36 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: boothowto.9,v 1.1 2009/09/04 23:23:05 apb Exp $ +.\" $NetBSD: boothowto.9,v 1.2 2009/09/05 11:32:36 wiz Exp $ .\" .\" Copyright (c) 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In sys/reboot.h .In sys/systm.h -.Vt extern int boothowto +.Vt extern int boothowto; .In sys/boot_flag.h .Vt #define BOOT_FLAG(arg, retval) ... .Sh DESCRIPTION @@ -53,11 +53,10 @@ .In sys/reboot.h . .Pp The -.Sy BOOT_FLAG +.Dv BOOT_FLAG macro defined in .In sys/boot_flag.h -is used by many boot loaders to convert command line options -into +is used by many boot loaders to convert command line options into .Va boothowto flags. Note that not all boot loaders use this macro, and some boot loaders @@ -74,7 +73,7 @@ the corresponding numeric value defined in .In sys/reboot.h , and the option letter (if any) understood by the -.Sy BOOT_FLAG +.Dv BOOT_FLAG macro. . .Ss Flags that affect booting or shutting down @@ -121,7 +120,7 @@ .Xr cpu_reboot 9 ) . .It Devices will not be detached (see -.Xr autoconfig 9 ) . +.Xr autoconf 9 ) . .\" actually, see config_detach_all, but that is undocumented .It File systems will not be unmounted (see @@ -151,7 +150,7 @@ .Xr ddb 4 , .Xs "options KGDB" in -.Xr options 7 , +.Xr options 4 , .\" the kgdb_* functions are undocumented and .Xr ipkdb 9 . @@ -249,17 +248,27 @@ .El . .Sh SEE ALSO -.Xr reboot 2 , \" sets boothowto -.Xr ddb 4 , \" RB_KDB -.Xr userconf 4 , \" RB_USERCONF -.Xr boot 8 , \" sets boothowto +.\" sets boothowto +.Xr reboot 2 , +.\" RB_KDB +.Xr ddb 4 , +.\" RB_USERCONF +.Xr userconf 4 , +.\" sets boothowto +.Xr boot 8 , .\" .Xr crash 8 , -.Xr init 8 , \" RB_SINGLE, RB_INITNAME -.Xr reboot 8 , \" reboot/poweroff/halt calls reboot(2) -.Xr savecore 8 , \" useful after RB_DUMP -.Xr sync 8 , \" RB_NOSYNC -.Xr cpu_reboot 9 , \" RB_NOSYNC, RB_HALT, RB_DUMP -.Xr kprintf 9\" aprint_*() functions use AB_* flags +.\" RB_SINGLE, RB_INITNAME +.Xr init 8 , +.\" reboot/poweroff/halt calls reboot(2) +.Xr reboot 8 , +.\" useful after RB_DUMP +.Xr savecore 8 , +.\" RB_NOSYNC +.Xr sync 8 , +.\" RB_NOSYNC, RB_HALT, RB_DUMP +.Xr cpu_reboot 9 , +.\" aprint_*() functions use AB_* flags +.Xr kprintf 9 .Sh HISTORY The .Va boothowto
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Sat Sep 5 11:02:49 UTC 2009 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: zalloc new rumpfs nodes to make sure rn_vp is initially NULL. Fixes problem pointed out by Nicolas Joly in private email. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/rump/librump/rumpvfs/rumpfs.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/rump/librump/rumpvfs/rumpfs.c diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.22 src/sys/rump/librump/rumpvfs/rumpfs.c:1.23 --- src/sys/rump/librump/rumpvfs/rumpfs.c:1.22 Tue Aug 4 12:40:42 2009 +++ src/sys/rump/librump/rumpvfs/rumpfs.c Sat Sep 5 11:02:49 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfs.c,v 1.22 2009/08/04 12:40:42 pooka Exp $ */ +/* $NetBSD: rumpfs.c,v 1.23 2009/09/05 11:02:49 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.22 2009/08/04 12:40:42 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.23 2009/09/05 11:02:49 pooka Exp $"); #include #include @@ -254,7 +254,7 @@ struct vattr *va; struct timespec ts; - rn = kmem_alloc(sizeof(*rn), KM_SLEEP); + rn = kmem_zalloc(sizeof(*rn), KM_SLEEP); LIST_INIT(&rn->rn_dir); nanotime(&ts);
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: taca Date: Sat Sep 5 10:16:46 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Correct files' suffix of the previous commit. To generate a diff of this commit: cvs rdiff -u -r1.1303 -r1.1304 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1303 src/distrib/sets/lists/comp/mi:1.1304 --- src/distrib/sets/lists/comp/mi:1.1303 Sat Sep 5 09:47:14 2009 +++ src/distrib/sets/lists/comp/mi Sat Sep 5 10:16:46 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1303 2009/09/05 09:47:14 taca Exp $ +# $NetBSD: mi,v 1.1304 2009/09/05 10:16:46 taca Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -8106,7 +8106,7 @@ ./usr/share/man/cat8/cvsbug.0 comp-cvs-catman cvs,.cat ./usr/share/man/cat8/genassym.0 comp-obsolete obsolete ./usr/share/man/cat8/kgmon.0 comp-sysutil-catman .cat -./usr/share/man/cat9/BOOT_FLAG.9 comp-sys-catman .cat +./usr/share/man/cat9/BOOT_FLAG.0 comp-sys-catman .cat ./usr/share/man/cat9/CALLOUT_INITIALIZER.0 comp-obsolete obsolete ./usr/share/man/cat9/CALLOUT_INITIALIZER_SETFUNC.0 comp-obsolete obsolete ./usr/share/man/cat9/CARDBUS_PRODUCT.0 comp-sys-catman .cat @@ -8285,7 +8285,7 @@ ./usr/share/man/cat9/biowait.0 comp-sys-catman .cat ./usr/share/man/cat9/bitmask_snprintf.0 comp-obsolete obsolete ./usr/share/man/cat9/bluetooth.0 comp-sys-catman .cat -./usr/share/man/cat9/boothowto.9 comp-sys-catman .cat +./usr/share/man/cat9/boothowto.0 comp-sys-catman .cat ./usr/share/man/cat9/boottime.0 comp-sys-catman .cat ./usr/share/man/cat9/bounds_check_with_label.0 comp-sys-catman .cat ./usr/share/man/cat9/bread.0 comp-sys-catman .cat @@ -13541,7 +13541,7 @@ ./usr/share/man/html7/operator.html comp-c-htmlman html ./usr/share/man/html8/cvsbug.html comp-cvs-htmlman cvs,html ./usr/share/man/html8/kgmon.html comp-sysutil-htmlman html -./usr/share/man/html9/BOOT_FLAG.9 comp-sys-htmlman html +./usr/share/man/html9/BOOT_FLAG.html comp-sys-htmlman html ./usr/share/man/html9/CARDBUS_PRODUCT.html comp-sys-htmlman html ./usr/share/man/html9/CARDBUS_VENDOR.html comp-sys-htmlman html ./usr/share/man/html9/Cardbus_conf_read.html comp-sys-htmlman html @@ -13706,7 +13706,7 @@ ./usr/share/man/html9/biowait.html comp-sys-htmlman html ./usr/share/man/html9/bitmask_snprintf.html comp-obsolete obsolete ./usr/share/man/html9/bluetooth.html comp-sys-htmlman html -./usr/share/man/html9/boothowto.9 comp-sys-htmlman html +./usr/share/man/html9/boothowto.html comp-sys-htmlman html ./usr/share/man/html9/boottime.html comp-sys-htmlman html ./usr/share/man/html9/bounds_check_with_label.html comp-sys-htmlman html ./usr/share/man/html9/bread.html comp-sys-htmlman html
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: taca Date: Sat Sep 5 09:47:14 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Need entries for cat9 and html9 directorys. To generate a diff of this commit: cvs rdiff -u -r1.1302 -r1.1303 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1302 src/distrib/sets/lists/comp/mi:1.1303 --- src/distrib/sets/lists/comp/mi:1.1302 Sat Sep 5 08:55:40 2009 +++ src/distrib/sets/lists/comp/mi Sat Sep 5 09:47:14 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1302 2009/09/05 08:55:40 apb Exp $ +# $NetBSD: mi,v 1.1303 2009/09/05 09:47:14 taca Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -8106,6 +8106,7 @@ ./usr/share/man/cat8/cvsbug.0 comp-cvs-catman cvs,.cat ./usr/share/man/cat8/genassym.0 comp-obsolete obsolete ./usr/share/man/cat8/kgmon.0 comp-sysutil-catman .cat +./usr/share/man/cat9/BOOT_FLAG.9 comp-sys-catman .cat ./usr/share/man/cat9/CALLOUT_INITIALIZER.0 comp-obsolete obsolete ./usr/share/man/cat9/CALLOUT_INITIALIZER_SETFUNC.0 comp-obsolete obsolete ./usr/share/man/cat9/CARDBUS_PRODUCT.0 comp-sys-catman .cat @@ -8284,6 +8285,7 @@ ./usr/share/man/cat9/biowait.0 comp-sys-catman .cat ./usr/share/man/cat9/bitmask_snprintf.0 comp-obsolete obsolete ./usr/share/man/cat9/bluetooth.0 comp-sys-catman .cat +./usr/share/man/cat9/boothowto.9 comp-sys-catman .cat ./usr/share/man/cat9/boottime.0 comp-sys-catman .cat ./usr/share/man/cat9/bounds_check_with_label.0 comp-sys-catman .cat ./usr/share/man/cat9/bread.0 comp-sys-catman .cat @@ -13539,6 +13541,7 @@ ./usr/share/man/html7/operator.html comp-c-htmlman html ./usr/share/man/html8/cvsbug.html comp-cvs-htmlman cvs,html ./usr/share/man/html8/kgmon.html comp-sysutil-htmlman html +./usr/share/man/html9/BOOT_FLAG.9 comp-sys-htmlman html ./usr/share/man/html9/CARDBUS_PRODUCT.html comp-sys-htmlman html ./usr/share/man/html9/CARDBUS_VENDOR.html comp-sys-htmlman html ./usr/share/man/html9/Cardbus_conf_read.html comp-sys-htmlman html @@ -13703,6 +13706,7 @@ ./usr/share/man/html9/biowait.html comp-sys-htmlman html ./usr/share/man/html9/bitmask_snprintf.html comp-obsolete obsolete ./usr/share/man/html9/bluetooth.html comp-sys-htmlman html +./usr/share/man/html9/boothowto.9 comp-sys-htmlman html ./usr/share/man/html9/boottime.html comp-sys-htmlman html ./usr/share/man/html9/bounds_check_with_label.html comp-sys-htmlman html ./usr/share/man/html9/bread.html comp-sys-htmlman html
CVS commit: src/usr.bin/sort
Module Name:src
Committed By: dsl
Date: Sat Sep 5 09:16:18 UTC 2009
Modified Files:
src/usr.bin/sort: Makefile init.c sort.c sort.h
Added Files:
src/usr.bin/sort: radix_sort.c
Log Message:
Include a local copy of the sradixsort() code from libc.
Currently unchanged apart from the deletion of the 'unstable' version and
other unneeded code.
Use fldtab[0]. not fldtab-> when we are referring to the global info
in the 0th entry to emphasise that this entry is different.
fldtab[0].weights is only needed in the SINGL_FLD case - so set it there.
Re-indent a big 'if' is setfield() so that the line breaks match the
logic - which looks dubious now!
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/sort/Makefile
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/sort/init.c
cvs rdiff -u -r0 -r1.1 src/usr.bin/sort/radix_sort.c
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/sort/sort.c
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/sort/sort.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sort/Makefile
diff -u src/usr.bin/sort/Makefile:1.6 src/usr.bin/sort/Makefile:1.7
--- src/usr.bin/sort/Makefile:1.6 Tue Apr 14 22:15:26 2009
+++ src/usr.bin/sort/Makefile Sat Sep 5 09:16:18 2009
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/04/14 22:15:26 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2009/09/05 09:16:18 dsl Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= sort
SRCS= append.c fields.c files.c fsort.c init.c msort.c sort.c tmp.c
+SRCS+= radix_sort.c
.include
Index: src/usr.bin/sort/init.c
diff -u src/usr.bin/sort/init.c:1.21 src/usr.bin/sort/init.c:1.22
--- src/usr.bin/sort/init.c:1.21 Sat Aug 22 21:50:32 2009
+++ src/usr.bin/sort/init.c Sat Sep 5 09:16:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.21 2009/08/22 21:50:32 dsl Exp $ */
+/* $NetBSD: init.c,v 1.22 2009/09/05 09:16:18 dsl Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include "sort.h"
#ifndef lint
-__RCSID("$NetBSD: init.c,v 1.21 2009/08/22 21:50:32 dsl Exp $");
+__RCSID("$NetBSD: init.c,v 1.22 2009/09/05 09:16:18 dsl Exp $");
__SCCSID("@(#)init.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@@ -210,10 +210,12 @@
if (!cur_fld->tcol.indent) /* BT has no meaning at end of field */
cur_fld->flags &= ~BT;
- if (cur_fld->tcol.num && !(!(cur_fld->flags & BI)
- && cur_fld->flags & BT) && (cur_fld->tcol.num <= cur_fld->icol.num
- && cur_fld->tcol.indent != 0 /* == 0 -> end of field, i.e. okay */
- && cur_fld->tcol.indent < cur_fld->icol.indent))
+ if (cur_fld->tcol.num
+ && !(!(cur_fld->flags & BI) && cur_fld->flags & BT)
+ && (cur_fld->tcol.num <= cur_fld->icol.num
+ /* indent if 0 -> end of field, i.e. okay */
+ && cur_fld->tcol.indent != 0
+ && cur_fld->tcol.indent < cur_fld->icol.indent))
errx(2, "fields out of order");
insertcol(cur_fld);
return (cur_fld->tcol.num);
@@ -333,7 +335,7 @@
* and -d (only sort blank and alphanumerics).
*/
void
-settables(int gflags)
+settables(void)
{
int i;
int next_weight = SINGL_FLD ? 1 : 2;
Index: src/usr.bin/sort/sort.c
diff -u src/usr.bin/sort/sort.c:1.53 src/usr.bin/sort/sort.c:1.54
--- src/usr.bin/sort/sort.c:1.53 Sat Aug 22 21:43:53 2009
+++ src/usr.bin/sort/sort.c Sat Sep 5 09:16:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sort.c,v 1.53 2009/08/22 21:43:53 dsl Exp $ */
+/* $NetBSD: sort.c,v 1.54 2009/09/05 09:16:18 dsl Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
#endif /* not lint */
#ifndef lint
-__RCSID("$NetBSD: sort.c,v 1.53 2009/08/22 21:43:53 dsl Exp $");
+__RCSID("$NetBSD: sort.c,v 1.54 2009/09/05 09:16:18 dsl Exp $");
__SCCSID("@(#)sort.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@@ -103,11 +103,6 @@
u_char unweighted[NBINS];
int SINGL_FLD = 0, SEP_FLAG = 0, UNIQUE = 0;
-/*
- * Default to stable sort.
- */
-int (*radix_sort)(const u_char **, int, const u_char *, u_int) = sradixsort;
-
unsigned int debug_flags = 0;
static char toutpath[MAXPATHLEN];
@@ -124,11 +119,11 @@
main(int argc, char *argv[])
{
get_func_t get;
- int ch, i, stdinflag = 0, tmp = 0;
+ int ch, i, stdinflag = 0;
char cflag = 0, mflag = 0;
char *outfile, *outpath = 0;
struct field *fldtab, *p;
- size_t fldtab_sz = 3, fidx = 0;
+ size_t fldtab_sz, fld_cnt;
struct filelist filelist;
int num_input_files;
FILE *outfp = NULL;
@@ -147,6 +142,9 @@
d_mask[REC_D = '\n'] = REC_D_F;
d_mask['\t'] = d_mask[' '] = BLANK | FLD_D;
+ /* fldtab[0] is the global options. */
+ fldtab_sz = 3;
+ fld_cnt = 0;
fldtab = malloc(fldtab_sz * sizeof(*fldtab));
memset(fldtab, 0, fldtab_sz * sizeof(*fldtab));
@@ -159,7 +157,7 @@
while ((ch = getopt(argc, argv, "bcdD:fik:mHno:rR:sSt:T:ux")) != -1) {
switch (ch) {
case 'b':
- fldtab->flags |= BI | BT;
+ fldtab[0].flags |= BI | BT;
break;
case 'c':
cflag = 1;
@@ -16
CVS commit: src
Module Name:src Committed By: apb Date: Sat Sep 5 08:55:41 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile Log Message: The man page should be BOOT_FLAG.9, not BOOT_FLAGS.9. I am not marking the incorrect name as "obsolete" in the set lists because it's been less than 12 hours. If you have already installed the incorrectly named file, you will have to delete it manually. To generate a diff of this commit: cvs rdiff -u -r1.1301 -r1.1302 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.289 -r1.290 src/share/man/man9/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1301 src/distrib/sets/lists/comp/mi:1.1302 --- src/distrib/sets/lists/comp/mi:1.1301 Fri Sep 4 23:23:05 2009 +++ src/distrib/sets/lists/comp/mi Sat Sep 5 08:55:40 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1301 2009/09/04 23:23:05 apb Exp $ +# $NetBSD: mi,v 1.1302 2009/09/05 08:55:40 apb Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -19055,7 +19055,7 @@ ./usr/share/man/man8/cvsbug.8 comp-cvs-man cvs,.man ./usr/share/man/man8/genassym.8 comp-obsolete obsolete ./usr/share/man/man8/kgmon.8 comp-sysutil-man .man -./usr/share/man/man9/BOOT_FLAGS.9 comp-sys-man .man +./usr/share/man/man9/BOOT_FLAG.9 comp-sys-man .man ./usr/share/man/man9/CALLOUT_INITIALIZER.9 comp-obsolete obsolete ./usr/share/man/man9/CALLOUT_INITIALIZER_SETFUNC.9 comp-obsolete obsolete ./usr/share/man/man9/CARDBUS_PRODUCT.9 comp-sys-man .man Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.289 src/share/man/man9/Makefile:1.290 --- src/share/man/man9/Makefile:1.289 Fri Sep 4 23:23:04 2009 +++ src/share/man/man9/Makefile Sat Sep 5 08:55:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.289 2009/09/04 23:23:04 apb Exp $ +# $NetBSD: Makefile,v 1.290 2009/09/05 08:55:41 apb Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -58,7 +58,7 @@ wscons.9 wsdisplay.9 wsfont.9 wskbd.9 wsmouse.9 MAN+= boothowto.9 -MLINKS+=boothowto.9 BOOT_FLAGS.9 +MLINKS+=boothowto.9 BOOT_FLAG.9 MAN+= dmover.9 MLINKS+=dmover.9 dmover_backend_register.9 \
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: dsl
Date: Sat Sep 5 08:53:06 UTC 2009
Modified Files:
src/lib/libc/stdlib: radixsort.c
Log Message:
Ansify functions and remove __P/
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/stdlib/radixsort.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/radixsort.c
diff -u src/lib/libc/stdlib/radixsort.c:1.18 src/lib/libc/stdlib/radixsort.c:1.19
--- src/lib/libc/stdlib/radixsort.c:1.18 Fri Aug 21 20:49:50 2009
+++ src/lib/libc/stdlib/radixsort.c Sat Sep 5 08:53:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: radixsort.c,v 1.18 2009/08/21 20:49:50 dsl Exp $ */
+/* $NetBSD: radixsort.c,v 1.19 2009/09/05 08:53:06 dsl Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)radixsort.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: radixsort.c,v 1.18 2009/08/21 20:49:50 dsl Exp $");
+__RCSID("$NetBSD: radixsort.c,v 1.19 2009/09/05 08:53:06 dsl Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,11 +71,10 @@
int sn, si;
} stack;
-static inline void simplesort
- __P((const u_char **, int, int, const u_char *, u_int));
-static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int));
-static void r_sort_b __P((const u_char **,
- const u_char **, int, int, const u_char *, u_int));
+static inline void simplesort(const u_char **, int, int, const u_char *, u_int);
+static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
+static void r_sort_b(const u_char **,
+ const u_char **, int, int, const u_char *, u_int);
#define THRESHOLD 20 /* Divert to simplesort(). */
#define SIZE 512 /* Default stack size. */
@@ -100,10 +99,7 @@
}
int
-radixsort(a, n, tab, endch)
- const u_char **a, *tab;
- int n;
- u_int endch;
+radixsort(const u_char **a, int n, const u_char *tab, u_int endch)
{
const u_char *tr;
u_int c;
@@ -117,10 +113,7 @@
}
int
-sradixsort(a, n, tab, endch)
- const u_char **a, *tab;
- int n;
- u_int endch;
+sradixsort(const u_char **a, int n, const u_char *tab, u_int endch)
{
const u_char *tr, **ta;
u_int c;
@@ -151,11 +144,7 @@
/* Unstable, in-place sort. */
static void
-r_sort_a(a, n, i, tr, endch)
- const u_char **a;
- int n, i;
- const u_char *tr;
- u_int endch;
+r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
{
static u_int count[256], nc, bmin;
u_int c;
@@ -245,11 +234,8 @@
/* Stable sort, requiring additional memory. */
static void
-r_sort_b(a, ta, n, i, tr, endch)
- const u_char **a, **ta;
- int n, i;
- const u_char *tr;
- u_int endch;
+r_sort_b(const u_char **a, const u_char **ta, int n, int i, const u_char *tr,
+u_int endch)
{
static u_int count[256], nc, bmin;
u_int c;
@@ -319,13 +305,10 @@
*--top[tr[(*ak)[i]]] = *ak;
}
}
-
+
+/* insertion sort */
static inline void
-simplesort(a, n, b, tr, endch) /* insertion sort */
- const u_char **a;
- int n, b;
- const u_char *tr;
- u_int endch;
+simplesort(const u_char **a, int n, int b, const u_char *tr, u_int endch)
{
u_char ch;
const u_char **ak, **ai, *s, *t;
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Sat Sep 5 08:23:24 UTC 2009
Modified Files:
src/sys/dev/ic: rtl8169.c
Log Message:
Remove one more extra whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/ic/rtl8169.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/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.126 src/sys/dev/ic/rtl8169.c:1.127
--- src/sys/dev/ic/rtl8169.c:1.126 Sat Sep 5 03:50:49 2009
+++ src/sys/dev/ic/rtl8169.c Sat Sep 5 08:23:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.126 2009/09/05 03:50:49 tsutsui Exp $ */
+/* $NetBSD: rtl8169.c,v 1.127 2009/09/05 08:23:24 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.126 2009/09/05 03:50:49 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.127 2009/09/05 08:23:24 tsutsui Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -690,7 +690,7 @@
BUS_DMA_COHERENT | BUS_DMA_NOWAIT)) != 0) {
aprint_error_dev(sc->sc_dev,
"can't map tx list, error = %d\n", error);
- goto fail_1;
+ goto fail_1;
}
memset(sc->re_ldata.re_tx_list, 0, RE_TX_LIST_SZ(sc));
