CVS commit: src/sys/arch/sparc/stand/common
Module Name:src Committed By: tsutsui Date: Sun Oct 18 06:24:22 UTC 2009 Modified Files: src/sys/arch/sparc/stand/common: promdev.c Log Message: Don't try to read disklabel to check FS_RAID on floppy boot since reopening floppy could cause Data Access Exception later. Fixes PR port-sparc/42186, ok'ed by m...@. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc/stand/common/promdev.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/sparc/stand/common/promdev.c diff -u src/sys/arch/sparc/stand/common/promdev.c:1.22 src/sys/arch/sparc/stand/common/promdev.c:1.23 --- src/sys/arch/sparc/stand/common/promdev.c:1.22 Mon Jan 12 11:32:44 2009 +++ src/sys/arch/sparc/stand/common/promdev.c Sun Oct 18 06:24:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: promdev.c,v 1.22 2009/01/12 11:32:44 tsutsui Exp $ */ +/* $NetBSD: promdev.c,v 1.23 2009/10/18 06:24:21 tsutsui Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -216,6 +216,15 @@ #endif /* + * Don't check disklabel on floppy boot since + * reopening it could cause Data Access Exception later. + */ + if (strncmp(prom_bootdevice, fd, 2) == 0 || + strstr(prom_bootdevice, SUNW,fdtwo) != NULL || + strstr(prom_bootdevice, fdthree) != NULL) + return 0; + + /* * We need to read from the raw partition (i.e. the * beginning of the disk in order to check the NetBSD * disklabel to see if the boot partition is type RAID.
CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua
Module Name:src
Committed By: agc
Date: Sun Oct 18 07:14:19 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: glue.c
Log Message:
Minor renaming of lua array
Zero allocated storage after return from lua_newuserdata()
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.1 src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.2
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c:1.1 Mon Oct 12 02:55:46 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/glue.c Sun Oct 18 07:14:19 2009
@@ -104,6 +104,7 @@
netpgp_t *netpgp;
netpgp = lua_newuserdata(L, sizeof(*netpgp));
+ (void) memset(netpgp, 0x0, sizeof(*netpgp));
set_homedir(netpgp, getenv(HOME), /.gnupg, 1);
netpgp_setvar(netpgp, hash, DEFAULT_HASH_ALG);
return 1;
@@ -332,7 +333,7 @@
return 1;
}
-const struct luaL_reg libnetpgp[] = {
+const struct luaL_reg libluanetpgp[] = {
{ new, l_new },
{ init, l_init },
@@ -356,6 +357,6 @@
int
luaopen_netpgp(lua_State *L)
{
- luaL_openlib(L, netpgp, libnetpgp, 0);
+ luaL_openlib(L, netpgp, libluanetpgp, 0);
return 1;
}
CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua
Module Name:src Committed By: agc Date: Sun Oct 18 07:14:55 UTC 2009 Added Files: src/crypto/external/bsd/netpgp/dist/bindings/lua: shlib_version Log Message: Create .so from the lua interface library To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/netpgp/dist/bindings/lua/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/shlib_version diff -u /dev/null src/crypto/external/bsd/netpgp/dist/bindings/lua/shlib_version:1.1 --- /dev/null Sun Oct 18 07:14:55 2009 +++ src/crypto/external/bsd/netpgp/dist/bindings/lua/shlib_version Sun Oct 18 07:14:55 2009 @@ -0,0 +1,2 @@ +major=0 +minor=0
CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua
Module Name:src
Committed By: agc
Date: Sun Oct 18 07:15:43 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: Makefile
Log Message:
Link in the netpgp shared library to the lua glue library
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.1 src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.2
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.1 Mon Oct 12 02:55:46 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile Sun Oct 18 07:15:43 2009
@@ -1,10 +1,13 @@
#PREFIX=/Users/agcrooks
PREFIX=/usr
+#LIBDIR=/usr/lib
+
LIB=luanetpgp
SRCS=glue.c
MKMAN=no
CPPFLAGS+=-g -I${PREFIX}/pkg/include
+LDADD+= -lnetpgp
WARNS=4
.include bsd.lib.mk
CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua
Module Name:src Committed By: agc Date: Sun Oct 18 07:17:28 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist/bindings/lua: netpgp.lua Log Message: Minor changes to find lua glue library, and to set the home directory on the correct C/Lua structure To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.1 src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.2 --- src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.1 Mon Oct 12 02:55:46 2009 +++ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua Sun Oct 18 07:17:28 2009 @@ -50,7 +50,8 @@ extension = .dylib io.close(f) end -glupkg = package.loadlib(libluanetpgp .. extension, luaopen_netpgp) +glupkg = package.loadlib(./ .. libluanetpgp .. extension, + luaopen_netpgp) netpgp = glupkg() -- initialise @@ -70,7 +71,7 @@ detached = detached end if options.homedir then - netpgp.homedir(netpgp, options.homedir) + netpgp.homedir(pgp, options.homedir) end -- initialise everything
CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua
Module Name:src Committed By: agc Date: Sun Oct 18 07:23:37 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist/bindings/lua: netpgp.lua Log Message: Use a lua for loop in preference to a while and increment in the lua example code - suggested by Marc Balmer. % make USETOOLS=no t cp Makefile a ./netpgp.lua --sign --detached a netpgp: default key set to C0596823 pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks a...@netbsd.org uid Alistair Crooks a...@pkgsrc.org uid Alistair Crooks a...@alistaircrooks.com uid Alistair Crooks alist...@hockley-crooks.com netpgp passphrase: -rw-r--r-- 1 agc agc 287 Oct 17 15:58 a.sig ./netpgp.lua --verify a.sig netpgp: default key set to C0596823 netpgp: assuming signed data in a Good signature for a.sig made Sat Oct 17 15:58:09 2009 using RSA (Encrypt or Sign) key 1b68dcfcc0596823 pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks alist...@hockley-crooks.com uid Alistair Crooks a...@pkgsrc.org uid Alistair Crooks a...@netbsd.org uid Alistair Crooks a...@alistaircrooks.com % To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.2 src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.3 --- src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.2 Sun Oct 18 07:17:28 2009 +++ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua Sun Oct 18 07:23:37 2009 @@ -77,8 +77,8 @@ -- initialise everything netpgp.init(pgp) -local i = 1 -while i = #args do +local i +for i = 1, #args do if options.encrypt then -- encrypt a file netpgp.encrypt_file(pgp, args[1], output, armour) @@ -97,5 +97,4 @@ -- verification of detached signature netpgp.verify_file(pgp, args[1], armour) end - i = i + 1 end
CVS commit: [netbsd-5] src/dist/nvi
Module Name:src
Committed By: sborrill
Date: Sun Oct 18 09:58:03 UTC 2009
Modified Files:
src/dist/nvi/common [netbsd-5]: multibyte.h options.c
src/dist/nvi/ex [netbsd-5]: ex_shift.c ex_txt.c version.h
src/dist/nvi/vi [netbsd-5]: v_ex.c v_increment.c v_txt.c
Log Message:
Pull up the following revisions(s) (requested by aymeric in ticket #1068):
dist/nvi/common/multibyte.h:revision 1.4
dist/nvi/vi/v_increment.c: revision 1.4
dist/nvi/vi/v_ex.c: revision 1.4
dist/nvi/common/options.c: revision 1.6
dist/nvi/ex/ex_shift.c: revision 1.3
dist/nvi/ex/ex_txt.c: revision 1.4
dist/nvi/ex/version.h: revision 1.4 via patch
dist/nvi/vi/v_txt.c:revision 1.6
Update to nvi-1.81.6nb5:
- Make :ESC, #+ and #- work again.
- Rename expandtabs to expandtab to match documentation.
- Implement the et abbreviation for expandtab.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.6.2 -r1.1.1.2.6.3 src/dist/nvi/common/multibyte.h
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/dist/nvi/common/options.c
cvs rdiff -u -r1.1.1.2.6.1 -r1.1.1.2.6.2 src/dist/nvi/ex/ex_shift.c
cvs rdiff -u -r1.1.1.2.6.2 -r1.1.1.2.6.3 src/dist/nvi/ex/ex_txt.c
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 src/dist/nvi/ex/version.h
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/dist/nvi/vi/v_ex.c
cvs rdiff -u -r1.1.1.2.6.1 -r1.1.1.2.6.2 src/dist/nvi/vi/v_increment.c
cvs rdiff -u -r1.1.1.2.6.3 -r1.1.1.2.6.4 src/dist/nvi/vi/v_txt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/common/multibyte.h
diff -u src/dist/nvi/common/multibyte.h:1.1.1.2.6.2 src/dist/nvi/common/multibyte.h:1.1.1.2.6.3
--- src/dist/nvi/common/multibyte.h:1.1.1.2.6.2 Mon Apr 13 20:59:20 2009
+++ src/dist/nvi/common/multibyte.h Sun Oct 18 09:58:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: multibyte.h,v 1.1.1.2.6.2 2009/04/13 20:59:20 snj Exp $ */
+/* $NetBSD: multibyte.h,v 1.1.1.2.6.3 2009/10/18 09:58:03 sborrill Exp $ */
#ifndef MULTIBYTE_H
#define MULTIBYTE_H
@@ -24,6 +24,7 @@
#define STRPBRK wcspbrk
#define TOUPPER towupper
#define STRSET wmemset
+#define STRCHR wcschr
#define L(ch) L ## ch
@@ -41,6 +42,7 @@
#define STRPBRK strpbrk
#define TOUPPER toupper
#define STRSET memset
+#define STRCHR strchr
#define L(ch) ch
Index: src/dist/nvi/common/options.c
diff -u src/dist/nvi/common/options.c:1.3.2.2 src/dist/nvi/common/options.c:1.3.2.3
--- src/dist/nvi/common/options.c:1.3.2.2 Tue Jan 20 02:56:07 2009
+++ src/dist/nvi/common/options.c Sun Oct 18 09:58:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.3.2.2 2009/01/20 02:56:07 snj Exp $ */
+/* $NetBSD: options.c,v 1.3.2.3 2009/10/18 09:58:03 sborrill Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -84,8 +84,8 @@
{L(errorbells), NULL, OPT_0BOOL, 0},
/* O_ESCAPETIME 4.4BSD */
{L(escapetime), NULL, OPT_NUM, 0},
-/* O_EXPANDTABS NetBSD 5.0 */
- {L(expandtabs), NULL, OPT_0BOOL, 0},
+/* O_EXPANDTAB NetBSD 5.0 */
+ {L(expandtab), NULL, OPT_0BOOL, 0},
/* O_EXRC System V (undocumented) */
{L(exrc), NULL, OPT_0BOOL, 0},
/* O_EXTENDED 4.4BSD */
@@ -267,6 +267,7 @@
{L(dir), O_TMP_DIRECTORY}, /* 4BSD */
{L(eb), O_ERRORBELLS}, /* 4BSD */
{L(ed), O_EDCOMPATIBLE}, /* 4BSD */
+ {L(et), O_EXPANDTAB}, /* NetBSD 5.0 */
{L(ex), O_EXRC}, /* System V (undocumented) */
#ifdef GTAGS
{L(gt), O_GTAGSMODE}, /* FreeBSD, NetBSD */
Index: src/dist/nvi/ex/ex_shift.c
diff -u src/dist/nvi/ex/ex_shift.c:1.1.1.2.6.1 src/dist/nvi/ex/ex_shift.c:1.1.1.2.6.2
--- src/dist/nvi/ex/ex_shift.c:1.1.1.2.6.1 Tue Jan 20 02:56:07 2009
+++ src/dist/nvi/ex/ex_shift.c Sun Oct 18 09:58:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_shift.c,v 1.1.1.2.6.1 2009/01/20 02:56:07 snj Exp $ */
+/* $NetBSD: ex_shift.c,v 1.1.1.2.6.2 2009/10/18 09:58:03 sborrill Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -135,7 +135,7 @@
*/
tbp = bp;
newidx = 0;
- if (!O_ISSET(sp, O_EXPANDTABS)) {
+ if (!O_ISSET(sp, O_EXPANDTAB)) {
for (; newcol = O_VAL(sp, O_TABSTOP); ++newidx) {
*tbp++ = '\t';
newcol -= O_VAL(sp, O_TABSTOP);
Index: src/dist/nvi/ex/ex_txt.c
diff -u src/dist/nvi/ex/ex_txt.c:1.1.1.2.6.2 src/dist/nvi/ex/ex_txt.c:1.1.1.2.6.3
--- src/dist/nvi/ex/ex_txt.c:1.1.1.2.6.2 Tue Jan 20 02:56:07 2009
+++ src/dist/nvi/ex/ex_txt.c Sun Oct 18 09:58:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_txt.c,v 1.1.1.2.6.2 2009/01/20 02:56:07 snj Exp $ */
+/* $NetBSD: ex_txt.c,v 1.1.1.2.6.3 2009/10/18 09:58:03 sborrill Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -407,7 +407,7 @@
*/
cno = 0;
tabs = 0;
- if (!O_ISSET(sp, O_EXPANDTABS)) {
+ if (!O_ISSET(sp, O_EXPANDTAB)) {
for (; cno + COL_OFF(cno, ts) = scno; ++tabs)
cno += COL_OFF(cno, ts);
}
Index: src/dist/nvi/ex/version.h
diff -u src/dist/nvi/ex/version.h:1.1.1.1.8.1 src/dist/nvi/ex/version.h:1.1.1.1.8.2
---
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sun Oct 18 09:58:56 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1068 To generate a diff of this commit: cvs rdiff -u -r1.1.2.115 -r1.1.2.116 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.115 src/doc/CHANGES-5.1:1.1.2.116 --- src/doc/CHANGES-5.1:1.1.2.115 Fri Oct 16 14:57:09 2009 +++ src/doc/CHANGES-5.1 Sun Oct 18 09:58:56 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.115 2009/10/16 14:57:09 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.116 2009/10/18 09:58:56 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14331,3 +14331,18 @@ Make the format for -k flag clearer. [hubertf, ticket #1097] +dist/nvi/common/multibyte.h 1.4 +dist/nvi/vi/v_increment.c 1.4 +dist/nvi/vi/v_ex.c1.4 +dist/nvi/common/options.c 1.6 +dist/nvi/ex/ex_shift.c1.3 +dist/nvi/ex/ex_txt.c1.4 +dist/nvi/ex/version.h1.4 via patch +dist/nvi/vi/v_txt.c1.6 + + Update to nvi-1.81.6nb5: + - Make :ESC, #+ and #- work again. + - Rename expandtabs to expandtab to match documentation. + - Implement the et abbreviation for expandtab. + [aymeric, ticket #1068] +
CVS commit: [netbsd-5] src/sys/arch/i386/pnpbios
Module Name:src Committed By: sborrill Date: Sun Oct 18 10:07:10 UTC 2009 Modified Files: src/sys/arch/i386/pnpbios [netbsd-5]: ess_pnpbios.c Log Message: Pull up the following revisions(s) (requested by snj in ticket #1098): sys/arch/i386/pnpbios/ess_pnpbios.c:revision 1.19 Fix identification of ESS1878 on Fujitsu FMV-5100 NC/S by PnPBIOS. Fixes PR/41629. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.10.1 src/sys/arch/i386/pnpbios/ess_pnpbios.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/i386/pnpbios/ess_pnpbios.c diff -u src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.17 src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.17.10.1 --- src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.17 Mon Apr 28 20:23:25 2008 +++ src/sys/arch/i386/pnpbios/ess_pnpbios.c Sun Oct 18 10:07:10 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ess_pnpbios.c,v 1.17 2008/04/28 20:23:25 martin Exp $ */ +/* $NetBSD: ess_pnpbios.c,v 1.17.10.1 2009/10/18 10:07:10 sborrill Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ess_pnpbios.c,v 1.17 2008/04/28 20:23:25 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: ess_pnpbios.c,v 1.17.10.1 2009/10/18 10:07:10 sborrill Exp $); #include sys/param.h #include sys/systm.h @@ -75,6 +75,7 @@ strcmp(aa-idstr, CPQB0AC) /* 1869 */ strcmp(aa-idstr, CPQB0AD) /* 1869 */ strcmp(aa-idstr, CPQB0F1) /* 1869 */ + strcmp(aa-idstr, ESS1878) /* 1878 */ strcmp(aa-idstr, ESS1879)) /* 1879 */ return (0);
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sun Oct 18 10:07:47 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1098 To generate a diff of this commit: cvs rdiff -u -r1.1.2.116 -r1.1.2.117 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.116 src/doc/CHANGES-5.1:1.1.2.117 --- src/doc/CHANGES-5.1:1.1.2.116 Sun Oct 18 09:58:56 2009 +++ src/doc/CHANGES-5.1 Sun Oct 18 10:07:47 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.116 2009/10/18 09:58:56 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.117 2009/10/18 10:07:47 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14346,3 +14346,9 @@ - Implement the et abbreviation for expandtab. [aymeric, ticket #1068] +sys/arch/i386/pnpbios/ess_pnpbios.c 1.19 + + Fix identification of ESS1878 on Fujitsu FMV-5100 NC/S + by PnPBIOS. Fixes PR/41629. + [snj, ticket #1098] +
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: tron
Date: Sun Oct 18 11:54:37 UTC 2009
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
Log Message:
Fix off by one in parser for /etc/resolv.conf found by SSP.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.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/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.3 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.4
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.3 Thu Oct 1 16:36:20 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Sun Oct 18 11:54:37 2009
@@ -581,7 +581,7 @@
{
char line[256];
char nameserver[16];
- char keyword[10];
+ char keyword[11];
int numOfServers = 0;
FILE *fp = fopen(filePath, r);
if (fp == NULL) return -1;
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: ahoka
Date: Sun Oct 18 12:09:48 UTC 2009
Modified Files:
src/distrib/utils/sysinst: bsddisklabel.c defs.h disks.c main.c
src/distrib/utils/sysinst/arch/amd64: md.h
src/distrib/utils/sysinst/arch/i386: md.h
Log Message:
Give the option to use tmpfs for /tmp in sysinst instead of the older
mfs on i386 and amd64. Should be enabled on other platforms with reliable
tmpfs too.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/distrib/utils/sysinst/bsddisklabel.c
cvs rdiff -u -r1.145 -r1.146 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.108 -r1.109 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.53 -r1.54 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.25 -r1.26 src/distrib/utils/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.66 -r1.67 src/distrib/utils/sysinst/arch/i386/md.h
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/bsddisklabel.c
diff -u src/distrib/utils/sysinst/bsddisklabel.c:1.52 src/distrib/utils/sysinst/bsddisklabel.c:1.53
--- src/distrib/utils/sysinst/bsddisklabel.c:1.52 Thu May 14 16:23:38 2009
+++ src/distrib/utils/sysinst/bsddisklabel.c Sun Oct 18 12:09:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.52 2009/05/14 16:23:38 sborrill Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.53 2009/10/18 12:09:48 ahoka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -61,9 +61,9 @@
/* For the current state of this file blame a...@netbsd.org */
/* Even though he wasn't the last to hack it, but he did admit doing so :-) */
-#define PART_ANY -1
-#define PART_EXTRA -2
-#define PART_TMP_MFS -3
+#define PART_ANY -1
+#define PART_EXTRA -2
+#define PART_TMP_RAMDISK -3
/* Defaults for things that might be defined in md.h */
#ifndef PART_ROOT
@@ -290,7 +290,7 @@
}
size = NUMSEC(size, mult, dlcylsize);
- if (p-ptn_id == PART_TMP_MFS) {
+ if (p-ptn_id == PART_TMP_RAMDISK) {
p-size = size;
return 0;
}
@@ -357,9 +357,13 @@
#define PI_SWAP 1
{ PART_SWAP, { 's', 'w', 'a', 'p', '\0' },
DEFSWAPSIZE, DEFSWAPSIZE, 0, 0 },
- { PART_TMP_MFS,
+ { PART_TMP_RAMDISK,
+#ifdef HAVE_TMPFS
+ { 't', 'm', 'p', ' ', '(', 't', 'm', 'p', 'f', 's', ')', '\0' },
+#else
{ 't', 'm', 'p', ' ', '(', 'm', 'f', 's', ')', '\0' },
- 64, 0, 0, 0 },
+#endif
+ 64, 0, 0, 0 },
#define PI_USR 3
{ PART_USR, { '/', 'u', 's', 'r', '\0' }, DEFUSRSIZE,
0, 0, 0 },
@@ -495,7 +499,7 @@
break;
continue;
}
- if (p-ptn_id == PART_TMP_MFS)
+ if (p-ptn_id == PART_TMP_RAMDISK)
continue;
p-size += pi.free_space % dlcylsize;
break;
@@ -510,8 +514,8 @@
size = p-limit;
}
i = p-ptn_id;
- if (i == PART_TMP_MFS) {
- tmp_mfs_size = size;
+ if (i == PART_TMP_RAMDISK) {
+ tmp_ramdisk_size = size;
size = 0;
continue;
}
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.145 src/distrib/utils/sysinst/defs.h:1.146
--- src/distrib/utils/sysinst/defs.h:1.145 Sat Sep 19 14:57:27 2009
+++ src/distrib/utils/sysinst/defs.h Sun Oct 18 12:09:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.145 2009/09/19 14:57:27 abs Exp $ */
+/* $NetBSD: defs.h,v 1.146 2009/10/18 12:09:48 ahoka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -257,7 +257,7 @@
#define partition_name(x) ('a' + (x))
partinfo oldlabel[MAXPARTITIONS]; /* What we found on the disk */
partinfo bsdlabel[MAXPARTITIONS]; /* What we want it to look like */
-int tmp_mfs_size;
+daddr_t tmp_ramdisk_size;
#define DISKNAME_SIZE 16
char bsddiskname[DISKNAME_SIZE];
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.108 src/distrib/utils/sysinst/disks.c:1.109
--- src/distrib/utils/sysinst/disks.c:1.108 Sat Oct 3 12:00:00 2009
+++ src/distrib/utils/sysinst/disks.c Sun Oct 18 12:09:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.108 2009/10/03 12:00:00 martin Exp $ */
+/* $NetBSD: disks.c,v 1.109 2009/10/18 12:09:48 ahoka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -746,13 +746,18 @@
dump_freq, fsck_pass);
}
- if (tmp_mfs_size != 0) {
+ if (tmp_ramdisk_size != 0) {
+#ifdef HAVE_TMPFS
+ scripting_fprintf(f, tmpfs\t\t/tmp\ttmpfs\trw,-m=1777,-s=%d\n,
+ tmp_ramdisk_size * 512);
+#else
if (swap_dev != -1)
scripting_fprintf(f, /dev/%s%c\t\t/tmp\tmfs\trw,-s=%d\n,
-diskdev, 'a' + swap_dev, tmp_mfs_size);
+diskdev, 'a' + swap_dev, tmp_ramdisk_size);
else
scripting_fprintf(f, swap\t\t/tmp\tmfs\trw,-s=%d\n,
-tmp_mfs_size);
+tmp_ramdisk_size);
+#endif
}
/* Add /kern, /proc and /dev/pts to fstab and make mountpoint. */
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.53 src/distrib/utils/sysinst/main.c:1.54
--- src/distrib/utils/sysinst/main.c:1.53 Sun Dec 21 11:02:41 2008
+++
CVS commit: src/doc
Module Name:src Committed By: ahoka Date: Sun Oct 18 12:13:49 UTC 2009 Modified Files: src/doc: CHANGES Log Message: sysinst(8): Give the option to use tmpfs for /tmp in sysinst instead of the older mfs on i386 and amd64. [ahoka 20091018] To generate a diff of this commit: cvs rdiff -u -r1.1307 -r1.1308 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.1307 src/doc/CHANGES:1.1308 --- src/doc/CHANGES:1.1307 Fri Oct 16 21:59:40 2009 +++ src/doc/CHANGES Sun Oct 18 12:13:49 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1307 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1308 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -422,4 +422,5 @@ hdaudioctl(8): Add tool to manipulate hdaudio(4) devices [sborrill 20091011] dhcpcd(8): Import dhcpcd-5.1.2. [roy 20091016] - + sysinst(8): Give the option to use tmpfs for /tmp in sysinst instead of + the older mfs on i386 and amd64. [ahoka 20091018]
CVS commit: src/etc/mtree
Module Name:src
Committed By: stacktic
Date: Sun Oct 18 12:41:06 UTC 2009
Modified Files:
src/etc/mtree: Makefile
Log Message:
Fixed build with read-only source tree.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.7 src/etc/mtree/Makefile:1.8
--- src/etc/mtree/Makefile:1.7 Tue Sep 8 09:57:32 2009
+++ src/etc/mtree/Makefile Sun Oct 18 12:41:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/09/08 09:57:32 he Exp $
+# $NetBSD: Makefile,v 1.8 2009/10/18 12:41:06 stacktic Exp $
.include bsd.own.mk
@@ -13,7 +13,8 @@
.endif
NetBSD.dist: NetBSD.dist.base ${NETBSD_DIST_X11_FILE}
- ${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${NETBSD_DIST_X11_FILE} ${.TARGET}
+ ${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${NETBSD_DIST_X11_FILE} \
+ ${.OBJDIR}/NetBSD.dist
CONFIGFILES= NetBSD.dist special
FILESDIR= /etc/mtree
CVS commit: [netbsd-5] src
Module Name:src
Committed By: sborrill
Date: Sun Oct 18 12:46:07 UTC 2009
Modified Files:
src/lib/libpuffs [netbsd-5]: dispatcher.c puffs.c puffs.h
src/sys/fs/puffs [netbsd-5]: puffs_msgif.h puffs_vnops.c
Log Message:
Pull up the following revisions(s) (requested by pooka in ticket #1100):
lib/libpuffs/dispatcher.c: revision 1.33
lib/libpuffs/puffs.c: revision 1.99
lib/libpuffs/puffs.h: revision 1.111
sys/fs/puffs/puffs_msgif.h: revision 1.67 via patch
sys/fs/puffs/puffs_vnops.c: revision 1.136
Support VOP_ABORTOP() in puffs.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.4.1 src/lib/libpuffs/dispatcher.c
cvs rdiff -u -r1.92.4.2 -r1.92.4.3 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.108.4.2 -r1.108.4.3 src/lib/libpuffs/puffs.h
cvs rdiff -u -r1.65 -r1.65.20.1 src/sys/fs/puffs/puffs_msgif.h
cvs rdiff -u -r1.129.4.2 -r1.129.4.3 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpuffs/dispatcher.c
diff -u src/lib/libpuffs/dispatcher.c:1.32 src/lib/libpuffs/dispatcher.c:1.32.4.1
--- src/lib/libpuffs/dispatcher.c:1.32 Tue Aug 12 19:44:39 2008
+++ src/lib/libpuffs/dispatcher.c Sun Oct 18 12:46:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatcher.c,v 1.32 2008/08/12 19:44:39 pooka Exp $ */
+/* $NetBSD: dispatcher.c,v 1.32.4.1 2009/10/18 12:46:07 sborrill Exp $ */
/*
* Copyright (c) 2006, 2007, 2008 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: dispatcher.c,v 1.32 2008/08/12 19:44:39 pooka Exp $);
+__RCSID($NetBSD: dispatcher.c,v 1.32.4.1 2009/10/18 12:46:07 sborrill Exp $);
#endif /* !lint */
#include sys/types.h
@@ -828,6 +828,24 @@
break;
}
+ case PUFFS_VN_ABORTOP:
+ {
+ struct puffs_vnmsg_abortop *auxt = auxbuf;
+ struct puffs_cn pcn;
+
+ if (pops-puffs_node_abortop == NULL) {
+error = 0;
+break;
+ }
+
+ pcn.pcn_pkcnp = auxt-pvnr_cn;
+ PUFFS_KCREDTOCRED(pcn.pcn_cred, auxt-pvnr_cn_cred);
+
+ error = pops-puffs_node_abortop(pu, opcookie, pcn);
+
+ break;
+ }
+
case PUFFS_VN_READ:
{
struct puffs_vnmsg_read *auxt = auxbuf;
@@ -896,6 +914,8 @@
break;
}
+#if 0
+ /* not issued by kernel currently */
} else if (PUFFSOP_OPCLASS(preq-preq_opclass) == PUFFSOP_CACHE) {
struct puffs_cacheinfo *pci = (void *)preq;
@@ -904,6 +924,7 @@
pci-pcache_nruns, pci-pcache_runs);
}
error = 0;
+#endif
} else if (PUFFSOP_OPCLASS(preq-preq_opclass) == PUFFSOP_ERROR) {
struct puffs_error *perr = (void *)preq;
Index: src/lib/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.92.4.2 src/lib/libpuffs/puffs.c:1.92.4.3
--- src/lib/libpuffs/puffs.c:1.92.4.2 Fri Oct 16 12:10:54 2009
+++ src/lib/libpuffs/puffs.c Sun Oct 18 12:46:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.c,v 1.92.4.2 2009/10/16 12:10:54 sborrill Exp $ */
+/* $NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: puffs.c,v 1.92.4.2 2009/10/16 12:10:54 sborrill Exp $);
+__RCSID($NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $);
#endif /* !lint */
#include sys/param.h
@@ -99,6 +99,7 @@
FILLOP(print,PRINT);
FILLOP(read, READ);
FILLOP(write,WRITE);
+ FILLOP(abortop, ABORTOP);
}
#undef FILLOP
@@ -584,21 +585,15 @@
return rv;
}
+/*ARGSUSED*/
struct puffs_usermount *
-_puffs_init(int develv, struct puffs_ops *pops, const char *mntfromname,
+_puffs_init(int dummy, struct puffs_ops *pops, const char *mntfromname,
const char *puffsname, void *priv, uint32_t pflags)
{
struct puffs_usermount *pu;
struct puffs_kargs *pargs;
int sverrno;
- if (develv != PUFFS_DEVEL_LIBVERSION) {
- warnx(puffs_init: mounting with lib version %d, need %d,
- develv, PUFFS_DEVEL_LIBVERSION);
- errno = EINVAL;
- return NULL;
- }
-
pu = malloc(sizeof(struct puffs_usermount));
if (pu == NULL)
goto failfree;
Index: src/lib/libpuffs/puffs.h
diff -u src/lib/libpuffs/puffs.h:1.108.4.2 src/lib/libpuffs/puffs.h:1.108.4.3
--- src/lib/libpuffs/puffs.h:1.108.4.2 Fri Oct 16 12:10:54 2009
+++ src/lib/libpuffs/puffs.h Sun Oct 18 12:46:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.h,v 1.108.4.2 2009/10/16 12:10:54 sborrill Exp $ */
+/* $NetBSD: puffs.h,v 1.108.4.3 2009/10/18 12:46:07 sborrill Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -218,10 +218,13 @@
uint8_t *, off_t, size_t *, const struct puffs_cred *, int);
int (*puffs_node_write)(struct puffs_usermount *, puffs_cookie_t,
uint8_t *, off_t, size_t *, const struct puffs_cred *, int);
+ int (*puffs_node_abortop)(struct puffs_usermount *, puffs_cookie_t,
+ const struct puffs_cn *);
- /*
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sun Oct 18 12:46:42 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1100 To generate a diff of this commit: cvs rdiff -u -r1.1.2.117 -r1.1.2.118 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.117 src/doc/CHANGES-5.1:1.1.2.118 --- src/doc/CHANGES-5.1:1.1.2.117 Sun Oct 18 10:07:47 2009 +++ src/doc/CHANGES-5.1 Sun Oct 18 12:46:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.117 2009/10/18 10:07:47 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.118 2009/10/18 12:46:42 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14352,3 +14352,12 @@ by PnPBIOS. Fixes PR/41629. [snj, ticket #1098] +lib/libpuffs/dispatcher.c 1.33 +lib/libpuffs/puffs.c1.99 +lib/libpuffs/puffs.h1.111 +sys/fs/puffs/puffs_msgif.h 1.67 via patch +sys/fs/puffs/puffs_vnops.c 1.136 + + Support VOP_ABORTOP() in puffs. + [pooka, ticket #1100] +
CVS commit: [netbsd-4] src/usr.sbin/pstat
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 12:58:20 UTC 2009
Modified Files:
src/usr.sbin/pstat [netbsd-4]: pstat.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1360):
usr.sbin/pstat/pstat.c: revision 1.115
Distinguish between UFS1 and UFS2 inodes by reading the ufsmount structure,
the previous heuristic of comparing the size fields of inode and dinode
failed.
To generate a diff of this commit:
cvs rdiff -u -r1.96.2.1 -r1.96.2.2 src/usr.sbin/pstat/pstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/pstat/pstat.c
diff -u src/usr.sbin/pstat/pstat.c:1.96.2.1 src/usr.sbin/pstat/pstat.c:1.96.2.2
--- src/usr.sbin/pstat/pstat.c:1.96.2.1 Fri Mar 20 15:29:14 2009
+++ src/usr.sbin/pstat/pstat.c Sun Oct 18 12:58:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pstat.c,v 1.96.2.1 2009/03/20 15:29:14 msaitoh Exp $ */
+/* $NetBSD: pstat.c,v 1.96.2.2 2009/10/18 12:58:20 bouyer Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)pstat.c 8.16 (Berkeley) 5/9/95;
#else
-__RCSID($NetBSD: pstat.c,v 1.96.2.1 2009/03/20 15:29:14 msaitoh Exp $);
+__RCSID($NetBSD: pstat.c,v 1.96.2.2 2009/10/18 12:58:20 bouyer Exp $);
#endif
#endif /* not lint */
@@ -48,11 +48,12 @@
#include sys/vnode.h
#include sys/ucred.h
#define _KERNEL
-#include sys/file.h
-#include ufs/ufs/inode.h
#define NFS
#include sys/mount.h
#undef NFS
+#include sys/file.h
+#include ufs/ufs/inode.h
+#include ufs/ufs/ufsmount.h
#include sys/uio.h
#include sys/namei.h
#include miscfs/genfs/layer.h
@@ -471,6 +472,7 @@
struct ufs1_dinode dp1;
struct ufs2_dinode dp2;
} dip;
+ struct ufsmount ump;
char flags[sizeof(ufs_flags) / sizeof(ufs_flags[0])];
char dev[4 + 1 + 7 + 1]; /* 12bit marjor + 20bit minor */
char *name;
@@ -478,13 +480,15 @@
dev_t rdev;
KGETRET(VTOI(vp), inode, sizeof(struct inode), vnode's inode);
- KGETRET(ip-i_din.ffs1_din, dip, sizeof (struct ufs1_dinode),
- inode's dinode);
+ KGETRET(ip-i_ump, ump, sizeof(struct ufsmount),
+ vnode's mount point);
- if (ip-i_size == dip.dp1.di_size)
+ if (ump.um_fstype == UFS1) {
+ KGETRET(ip-i_din.ffs1_din, dip, sizeof (struct ufs1_dinode),
+ inode's dinode);
rdev = dip.dp1.di_rdev;
- else {
- KGETRET(ip-i_din.ffs1_din, dip, sizeof (struct ufs2_dinode),
+ } else {
+ KGETRET(ip-i_din.ffs2_din, dip, sizeof (struct ufs2_dinode),
inode's UFS2 dinode);
rdev = dip.dp2.di_rdev;
}
CVS commit: [netbsd-4] src/bin/kill
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 12:59:46 UTC 2009
Modified Files:
src/bin/kill [netbsd-4]: kill.c
Log Message:
Pull up following revision(s) (requested by spz in ticket #1361):
bin/kill/kill.c: revision 1.26
Make sure that numerical signals and pids are in range for their types.
Fixes PR bin/42143
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.4.1 src/bin/kill/kill.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/kill/kill.c
diff -u src/bin/kill/kill.c:1.24 src/bin/kill/kill.c:1.24.4.1
--- src/bin/kill/kill.c:1.24 Fri Mar 17 22:30:11 2006
+++ src/bin/kill/kill.c Sun Oct 18 12:59:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kill.c,v 1.24 2006/03/17 22:30:11 christos Exp $ */
+/* $NetBSD: kill.c,v 1.24.4.1 2009/10/18 12:59:45 bouyer Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)kill.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: kill.c,v 1.24 2006/03/17 22:30:11 christos Exp $);
+__RCSID($NetBSD: kill.c,v 1.24.4.1 2009/10/18 12:59:45 bouyer Exp $);
#endif
#endif /* not lint */
@@ -49,6 +49,8 @@
#include signal.h
#include stdio.h
#include stdlib.h
+#include limits.h
+#include inttypes.h
#include string.h
#include termios.h
#include unistd.h
@@ -69,7 +71,8 @@
int
main(int argc, char *argv[])
{
- int errors, numsig, pid;
+ int errors;
+ intmax_t numsig, pid;
char *ep;
setprogname(argv[0]);
@@ -87,17 +90,19 @@
if (argc == 1) {
if (isdigit((unsigned char)**argv) == 0)
usage();
- numsig = strtol(*argv, ep, 10);
- if (*ep != '\0') {
+ numsig = strtoimax(*argv, ep, 10);
+ /* check for correctly parsed number */
+ if (*ep != '\0' || numsig == INTMAX_MIN || numsig == INTMAX_MAX) {
errx(EXIT_FAILURE, illegal signal number: %s,
*argv);
/* NOTREACHED */
}
if (numsig = 128)
numsig -= 128;
+ /* and whether it fits into signals range */
if (numsig = 0 || numsig = NSIG)
nosig(*argv);
- printf(%s\n, sys_signame[numsig]);
+ printf(%s\n, sys_signame[(int) numsig]);
exit(0);
}
printsignals(stdout);
@@ -122,12 +127,14 @@
if ((numsig = signame_to_signum(sn)) 0)
nosig(sn);
} else if (isdigit((unsigned char)*sn)) {
- numsig = strtol(sn, ep, 10);
- if (*ep) {
+ numsig = strtoimax(sn, ep, 10);
+ /* check for correctly parsed number */
+ if (*ep || numsig == INTMAX_MIN || numsig == INTMAX_MAX ) {
errx(EXIT_FAILURE, illegal signal number: %s,
sn);
/* NOTREACHED */
}
+ /* and whether it fits into signals range */
if (numsig 0 || numsig = NSIG)
nosig(sn);
} else
@@ -151,14 +158,17 @@
} else
#endif
{
- pid = strtol(*argv, ep, 10);
- if (!**argv || *ep) {
+ pid = strtoimax(*argv, ep, 10);
+ /* make sure the pid is a number and fits into pid_t */
+ if (!**argv || *ep || pid == INTMAX_MIN ||
+pid == INTMAX_MAX || pid != (pid_t) pid) {
+
warnx(illegal process id: %s, *argv);
errors = 1;
continue;
}
}
- if (kill(pid, numsig) == -1) {
+ if (kill((pid_t) pid, (int) numsig) == -1) {
warn(%s, *argv);
errors = 1;
}
@@ -166,7 +176,7 @@
/* Wakeup the process if it was suspended, so it can
exit without an explicit 'fg'. */
if (numsig == SIGTERM || numsig == SIGHUP)
- kill(pid, SIGCONT);
+ kill((pid_t) pid, SIGCONT);
#endif
}
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 18 13:02:42 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Tickets 1360, 1361 To generate a diff of this commit: cvs rdiff -u -r1.1.2.178 -r1.1.2.179 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.178 src/doc/CHANGES-4.1:1.1.2.179 --- src/doc/CHANGES-4.1:1.1.2.178 Fri Oct 9 12:08:16 2009 +++ src/doc/CHANGES-4.1 Sun Oct 18 13:02:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.178 2009/10/09 12:08:16 sborrill Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.179 2009/10/18 13:02:42 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3805,3 +3805,16 @@ Only generate SHA512 and MD5 checksums for releases. [snj, ticket #1365] +usr.sbin/pstat/pstat.c1.115 + + Distinguish between UFS1 and UFS2 inodes by reading the ufsmount + structure, the previous heuristic of comparing the size fields + of inode and dinode failed. + [mlelstv, ticket #1360] + +bin/kill/kill.c 1.26 + + Make sure that numerical signals and pids are in range for their types. + Fixes PR bin/42143 + [spz, ticket #1361] +
CVS commit: [netbsd-5] src/sys/dev/sbus
Module Name:src Committed By: bouyer Date: Sun Oct 18 13:23:31 UTC 2009 Modified Files: src/sys/dev/sbus [netbsd-5]: files.sbus zx.c zxreg.h zxvar.h Log Message: Pull up following revision(s) (requested by macallan in ticket #960): sys/dev/sbus/zxreg.h: revision 1.7 sys/dev/sbus/files.sbus: revision 1.32 sys/dev/sbus/zxvar.h: revision 1.4 sys/dev/sbus/zx.c: revision 1.27 Add wscons support To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.31.36.1 src/sys/dev/sbus/files.sbus cvs rdiff -u -r1.24.6.1 -r1.24.6.2 src/sys/dev/sbus/zx.c cvs rdiff -u -r1.5.4.1 -r1.5.4.2 src/sys/dev/sbus/zxreg.h cvs rdiff -u -r1.2.10.1 -r1.2.10.2 src/sys/dev/sbus/zxvar.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/sbus/files.sbus diff -u src/sys/dev/sbus/files.sbus:1.31 src/sys/dev/sbus/files.sbus:1.31.36.1 --- src/sys/dev/sbus/files.sbus:1.31 Sun Aug 26 00:39:39 2007 +++ src/sys/dev/sbus/files.sbus Sun Oct 18 13:23:31 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.sbus,v 1.31 2007/08/26 00:39:39 macallan Exp $ +# $NetBSD: files.sbus,v 1.31.36.1 2009/10/18 13:23:31 bouyer Exp $ # # Config file and device description for machine-independent SBUS code. # Included by ports that need it. @@ -119,7 +119,7 @@ attach tcx at sbus file dev/sbus/tcx.c tcx needs-flag -device zx: fb, rasops32 +device zx: fb, rasops32, wsemuldisplaydev, vcons attach zx at sbus file dev/sbus/zx.c zx Index: src/sys/dev/sbus/zx.c diff -u src/sys/dev/sbus/zx.c:1.24.6.1 src/sys/dev/sbus/zx.c:1.24.6.2 --- src/sys/dev/sbus/zx.c:1.24.6.1 Fri Apr 3 17:45:31 2009 +++ src/sys/dev/sbus/zx.c Sun Oct 18 13:23:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: zx.c,v 1.24.6.1 2009/04/03 17:45:31 snj Exp $ */ +/* $NetBSD: zx.c,v 1.24.6.2 2009/10/18 13:23:31 bouyer Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.24.6.1 2009/04/03 17:45:31 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.24.6.2 2009/10/18 13:23:31 bouyer Exp $); #include sys/param.h #include sys/systm.h @@ -66,45 +66,58 @@ #include dev/sun/fbio.h #include dev/sun/fbvar.h +#include wsdisplay.h +#if NWSDISPLAY 0 +#include dev/wscons/wsconsio.h +#include dev/wsfont/wsfont.h +#include dev/rasops/rasops.h +#include dev/wscons/wsdisplay_vconsvar.h + +#include opt_wsemul.h +#endif + #include dev/sbus/zxreg.h #include dev/sbus/zxvar.h #include dev/sbus/sbusvar.h #include dev/wscons/wsconsio.h -#ifndef RASTERCONSOLE -#error Sorry, this driver needs the RASTERCONSOLE option +#if (NWSDISPLAY == 0) !defined(RASTERCONSOLE) +#error Sorry, this driver needs WSCONS or RASTERCONSOLE +#endif + +#if (NWSDISPLAY 0) defined(RASTERCONSOLE) +#error Sorry, RASTERCONSOLE and WSCONS are mutually exclusive #endif #define ZX_STD_ROP (ZX_ROP_NEW | ZX_ATTR_WE_ENABLE | \ ZX_ATTR_OE_ENABLE | ZX_ATTR_FORCE_WID) -void zx_attach(struct device *, struct device *, void *); -int zx_match(struct device *, struct cfdata *, void *); +static void zx_attach(device_t, device_t, void *); +static int zx_match(device_t, struct cfdata *, void *); -void zx_blank(struct device *); -int zx_cmap_put(struct zx_softc *); -void zx_copyrect(struct rasops_info *, int, int, int, int, int, int); -int zx_cross_loadwid(struct zx_softc *, u_int, u_int, u_int); -int zx_cross_wait(struct zx_softc *); -void zx_fillrect(struct rasops_info *, int, int, int, int, long, int); -int zx_intr(void *); -void zx_reset(struct zx_softc *); -void zx_unblank(struct device *); - -void zx_cursor_blank(struct zx_softc *); -void zx_cursor_color(struct zx_softc *); -void zx_cursor_move(struct zx_softc *); -void zx_cursor_set(struct zx_softc *); -void zx_cursor_unblank(struct zx_softc *); - -void zx_copycols(void *, int, int, int, int); -void zx_copyrows(void *, int, int, int); -void zx_cursor(void *, int, int, int); -void zx_do_cursor(struct rasops_info *); -void zx_erasecols(void *, int, int, int, long); -void zx_eraserows(void *, int, int, long); -void zx_putchar(void *, int, int, u_int, long); +static void zx_blank(device_t); +static int zx_cmap_put(struct zx_softc *); +static void zx_copyrect(struct zx_softc *, int, int, int, int, int, int); +static int zx_cross_loadwid(struct zx_softc *, u_int, u_int, u_int); +static int zx_cross_wait(struct zx_softc *); +static void zx_fillrect(struct zx_softc *, int, int, int, int, uint32_t, int); +static int zx_intr(void *); +static void zx_reset(struct zx_softc *); +static void zx_unblank(device_t); + +static void zx_cursor_blank(struct zx_softc *); +static void zx_cursor_color(struct zx_softc *); +static void zx_cursor_move(struct zx_softc *); +static void zx_cursor_set(struct zx_softc *); +static void zx_cursor_unblank(struct zx_softc *); + +static void zx_copycols(void *, int, int, int, int); +static void zx_copyrows(void *, int, int, int); +static
CVS commit: [netbsd-5] src/etc/etc.sparc
Module Name:src Committed By: bouyer Date: Sun Oct 18 13:27:34 UTC 2009 Modified Files: src/etc/etc.sparc [netbsd-5]: ttys Log Message: Pull up following revision(s) (requested by macallan in ticket #961): etc/etc.sparc/ttys: revision 1.15 do as sparc64 does To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.2.1 src/etc/etc.sparc/ttys Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.sparc/ttys diff -u src/etc/etc.sparc/ttys:1.14 src/etc/etc.sparc/ttys:1.14.2.1 --- src/etc/etc.sparc/ttys:1.14 Tue Oct 7 10:00:02 2008 +++ src/etc/etc.sparc/ttys Sun Oct 18 13:27:34 2009 @@ -1,10 +1,16 @@ -# $NetBSD: ttys,v 1.14 2008/10/07 10:00:02 abs Exp $ +# $NetBSD: ttys,v 1.14.2.1 2009/10/18 13:27:34 bouyer Exp $ # # @(#)ttys 5.1 (Berkeley) 4/17/89 # # name gettytype status comments # -console /usr/libexec/getty suncons sun on secure -constty /usr/libexec/getty suncons sun off secure +console /usr/libexec/getty suncons sun-ss5 on secure +constty /usr/libexec/getty suncons sun-ss5 off secure +ttyE0 /usr/libexec/getty suncons sun-ss5 off secure +ttyE1 /usr/libexec/getty suncons sun-ss5 off secure +ttyE2 /usr/libexec/getty suncons sun-ss5 off secure +ttyE3 /usr/libexec/getty suncons sun-ss5 off secure ttya /usr/libexec/getty std.9600 unknown off secure ttyb /usr/libexec/getty std.9600 unknown off secure +ttyh0 /usr/libexec/getty std.9600 unknown off secure +ttyh1 /usr/libexec/getty std.9600 unknown off secure
CVS commit: [netbsd-5] src/sys/arch/sparc/conf
Module Name:src Committed By: bouyer Date: Sun Oct 18 13:33:29 UTC 2009 Modified Files: src/sys/arch/sparc/conf [netbsd-5]: GENERIC Log Message: Pull up following revision(s) (requested by macallan in ticket #965): sys/arch/sparc/conf/GENERIC: revision 1.208 wscons here we come! (finally) To generate a diff of this commit: cvs rdiff -u -r1.205.4.1 -r1.205.4.2 src/sys/arch/sparc/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.205.4.1 src/sys/arch/sparc/conf/GENERIC:1.205.4.2 --- src/sys/arch/sparc/conf/GENERIC:1.205.4.1 Fri Oct 16 06:30:01 2009 +++ src/sys/arch/sparc/conf/GENERIC Sun Oct 18 13:33:29 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.205.4.1 2009/10/16 06:30:01 snj Exp $ +# $NetBSD: GENERIC,v 1.205.4.2 2009/10/18 13:33:29 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.205.4.1 $ +#ident GENERIC-$Revision: 1.205.4.2 $ maxusers 32 @@ -45,14 +45,30 @@ ## Use a faster console than the PROM's slow drawing routines. Not needed ## for headless (no framebuffer) machines. -options RASTERCONSOLE # fast rasterop console -options FONT_GALLANT12x22 # the console font -#options FONT_BOLD8x16 # a somewhat smaller font -## default console colors: black-on-white; this can be changed -## using the following two options. +## These is obsolete for wscons kernels +#options RASTERCONSOLE # fast rasterop console #options RASTERCONSOLE_FGCOL=WSCOL_BLACK #options RASTERCONSOLE_BGCOL=WSCOL_WHITE +# wscons stuff +options WSEMUL_SUN +#options WSEMUL_VT100 +options WSDISPLAY_COMPAT_RAWKBD +options WSDISPLAY_CUSTOM_OUTPUT +options WS_DEFAULT_FG=WSCOL_BLACK +options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE +options WS_KERNEL_FG=WSCOL_GREEN +options WS_KERNEL_BG=WSCOL_LIGHT_WHITE +options WSDISPLAY_COMPAT_PCVT +options WSDISPLAY_COMPAT_SYSCONS +options WSDISPLAY_COMPAT_USL + +options WSDISPLAY_SCROLLSUPPORT + +# generic options vlid for both wscons and RASTERCONSOLE +options FONT_GALLANT12x22 # the console font +#options FONT_BOLD8x16 # a somewhat smaller font + System options that are the same for all ports ## Root device configuration: change the ?'s if you are going to use a @@ -316,16 +332,23 @@ zs0 at obio0 addr 0xf100 level 12 # sun4/200 and sun4/300 zs0 at obio0 addr 0x0100 level 12 # sun4/100 zs0 at bootbus0 # sun4d -zstty0 at zs0 channel 0# ttya -zstty1 at zs0 channel 1# ttyb zs1 at mainbus0 # sun4c zs1 at obio0 # sun4m zs1 at obio0 addr 0xf000 level 12 # sun4/200 and sun4/300 zs1 at obio0 addr 0x level 12 # sun4/100 zs1 at bootbus0 # sun4d -kbd0 at zs1 channel 0# keyboard -ms0 at zs1 channel 1# mouse + +# old kbd and mouse attachments +#kbd0 at zs1 channel 0# keyboard +#ms0 at zs1 channel 1# mouse +zstty* at zs? + +# these are for wscons +kbd0 at zstty? +ms0 at zstty? +wskbd* at wskbddev? +wsmouse* at wsmousedev? zs2 at obio0 addr 0xe000 level 12 # sun4/300 zstty2 at zs2 channel 0# ttyc @@ -637,7 +660,8 @@ bwtwo0 at obio0 addr 0x0b30 level 4 # sun4/100 in P4 slot ## Sun cgtwo VME color framebuffer -cgtwo0 at vme0 addr 0x40 irq ? vect 0xa8 +# XXX no wsdisplay support +#cgtwo0 at vme0 addr 0x40 irq ? vect 0xa8 ## Sun cgthree Sbus color framebuffer cgthree0 at sbus? slot ? offset ? @@ -646,8 +670,9 @@ ## Sun cgfour color framebuffer with overlay plane. See above comment ## regarding overlay plane. -cgfour0 at obio0 addr 0xfb30 level 4 # sun4/300 P4 -cgfour0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 +# XXX no wsdisplay support +#cgfour0 at obio0 addr 0xfb30 level 4 # sun4/300 P4 +#cgfour0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 ## Sun cgsix accelerated color framebuffer. cgsix0 at sbus? slot ? offset ? @@ -656,21 +681,31 @@ cgsix0 at obio0 addr 0x0b00 level 4 # sun4/100 P4 ## Sun cgeight 24-bit framebuffer -cgeight0 at obio0 addr 0xfb30 level 4 # sun4/300 P4 -cgeight0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 +# XXX no wsdisplay support +#cgeight0 at obio0 addr 0xfb30 level 4 # sun4/300 P4 +#cgeight0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 ## Sun tcx accelerated color framebuffer. -tcx0 at sbus? slot ? offset ? -tcx* at sbus? slot ? offset ? +# XXX no wsdisplay support +#tcx0 at sbus? slot ? offset ? +#tcx* at sbus? slot ? offset ? # Sun cgfourteen accelerated 24-bit framebuffer. -cgfourteen0 at obio0 # sun4m +cgfourteen* at obio0 # sun4m # P9100-based display on Tadpole SPARCbook 3. pnozz0 at sbus? slot ? offset ? # Sun ZX/Leo 24-bit framebuffer -zx* at sbus? slot ? offset ? +# XXX no wsdisplay support +#zx* at sbus? slot ? offset ? + +# Fujitsu AG-10e
CVS commit: [netbsd-5] src/sys/arch/sparc64/include
Module Name:src Committed By: bouyer Date: Sun Oct 18 13:34:49 UTC 2009 Modified Files: src/sys/arch/sparc64/include [netbsd-5]: bus.h Log Message: Pull up following revision(s) (requested by macallan in ticket #967): sys/arch/sparc64/include/bus.h: revision 1.59 again To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.58.10.1 src/sys/arch/sparc64/include/bus.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/include/bus.h diff -u src/sys/arch/sparc64/include/bus.h:1.58 src/sys/arch/sparc64/include/bus.h:1.58.10.1 --- src/sys/arch/sparc64/include/bus.h:1.58 Mon Apr 28 20:23:36 2008 +++ src/sys/arch/sparc64/include/bus.h Sun Oct 18 13:34:49 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bus.h,v 1.58 2008/04/28 20:23:36 martin Exp $ */ +/* $NetBSD: bus.h,v 1.58.10.1 2009/10/18 13:34:49 bouyer Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -307,7 +307,8 @@ #define BUS_SPACE_MAP_BUS2 0x0200 #define BUS_SPACE_MAP_BUS3 0x0400 #define BUS_SPACE_MAP_BUS4 0x0800 - +/* sparc uses this, it's not supposed to do anything on sparc64 */ +#define BUS_SPACE_MAP_LARGE 0 /* flags for bus_space_barrier() */ #define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */
CVS commit: [netbsd-5] src/sys/arch/sparc/conf
Module Name:src Committed By: bouyer Date: Sun Oct 18 13:35:29 UTC 2009 Modified Files: src/sys/arch/sparc/conf [netbsd-5]: INSTALL Log Message: Pull up following revision(s) (requested by macallan in ticket #968): sys/arch/sparc/conf/INSTALL: revision 1.64 convert to wscons, while there add some missing wsdisplay drivers To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.62.4.1 src/sys/arch/sparc/conf/INSTALL 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/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.62 src/sys/arch/sparc/conf/INSTALL:1.62.4.1 --- src/sys/arch/sparc/conf/INSTALL:1.62 Thu Jul 31 07:41:07 2008 +++ src/sys/arch/sparc/conf/INSTALL Sun Oct 18 13:35:29 2009 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.62 2008/07/31 07:41:07 simonb Exp $ +# $NetBSD: INSTALL,v 1.62.4.1 2009/10/18 13:35:29 bouyer Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -47,6 +47,16 @@ #options RASTERCONSOLE_FGCOL=WSCOL_BLACK #options RASTERCONSOLE_BGCOL=WSCOL_WHITE +# wscons stuff +options WSEMUL_SUN +#options WSEMUL_VT100 +options WSDISPLAY_COMPAT_RAWKBD +options WSDISPLAY_CUSTOM_OUTPUT +options WS_DEFAULT_FG=WSCOL_BLACK +options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE +options WS_KERNEL_FG=WSCOL_GREEN +options WS_KERNEL_BG=WSCOL_LIGHT_WHITE + System options that are the same for all ports ## Root device configuration: change the ?'s if you are going to use a @@ -270,20 +280,21 @@ zs0 at obio0 # sun4m zs0 at obio0 addr 0xf100 level 12 flags 0x103 # sun4/200 and sun4/300 zs0 at obio0 addr 0x0100 level 12 flags 0x103 # sun4/100 -zstty0 at zs0 channel 0 # ttya -zstty1 at zs0 channel 1 # ttyb zs1 at mainbus0 # sun4c zs1 at obio0 # sun4m zs1 at obio0 addr 0xf000 level 12 flags 0x103 # sun4/200 and sun4/300 zs1 at obio0 addr 0x level 12 flags 0x103 # sun4/100 -kbd0 at zs1 channel 0 # keyboard -ms0 at zs1 channel 1 # mouse -zs2 at obio0 addr 0xe000 level 12 flags 0x103 # sun4/300 -zstty2 at zs2 channel 0 # ttyc -zstty3 at zs2 channel 1 # ttyd +zs2 at obio0 addr 0xe000 level 12 # sun4/300 + +zstty* at zs? +# these are for wscons +kbd0 at zstty? +ms0 at zstty? +wskbd* at wskbddev? +wsmouse* at wsmousedev? ## Magma Serial/Parallel driver #magma* at sbus? slot ? offset ? @@ -545,12 +556,28 @@ #cgeight0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 ## Sun tcx accelerated color framebuffer. -tcx0 at sbus? slot ? offset ? -tcx* at sbus? slot ? offset ? +#tcx0 at sbus? slot ? offset ? +#tcx* at sbus? slot ? offset ? # Sun cgfourteen accelerated 24-bit framebuffer. -cgfourteen0 at obio0 # sun4m +cgfourteen* at obio0 # sun4m + +# P9100-based display on Tadpole SPARCbook 3. +pnozz0 at sbus? slot ? offset ? + +# Sun ZX/Leo 24-bit framebuffer +# XXX no wsdisplay support +#zx* at sbus? slot ? offset ? +# Fujitsu AG-10e accelerated graphics 8/24-bit board +agten* at sbus? slot ? offset ? + +# generic framebuffer console +genfb* at sbus? slot ? offset ? + +# make sure wsdisplay0 is the console +wsdisplay0 at wsemuldisplaydev? console 1 +wsdisplay* at wsemuldisplaydev? Other device configuration @@ -563,3 +590,6 @@ pseudo-device rnd #pseudo-device fss 4 # file system snapshot device + +pseudo-device wsmux # mouse and keyboard multiplexor +pseudo-device wsfont
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sun Oct 18 13:42:18 UTC 2009 Modified Files: src/doc: 3RDPARTY Log Message: binutils-2.20 out. To generate a diff of this commit: cvs rdiff -u -r1.721 -r1.722 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.721 src/doc/3RDPARTY:1.722 --- src/doc/3RDPARTY:1.721 Fri Oct 16 21:59:40 2009 +++ src/doc/3RDPARTY Sun Oct 18 13:42:17 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.721 2009/10/16 21:59:40 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.722 2009/10/18 13:42:17 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -132,7 +132,7 @@ Package: binutils Version: 2.16.1 -Current Vers: 2.19.1 +Current Vers: 2.20 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/binutils/ Home Page: http://www.gnu.org/software/binutils/
CVS commit: [netbsd-5] src/sys/arch/sparc
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 13:43:46 UTC 2009
Modified Files:
src/sys/arch/sparc/include [netbsd-5]: bus.h
src/sys/arch/sparc/sparc [netbsd-5]: machdep.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #969):
sys/arch/sparc/include/bus.h: revision 1.56
sys/arch/sparc/sparc/machdep.c: revision 1.294
do as phone suggested - remove sparc_bus_map_large() again and use a =20=
flag
instead ( BUS_SPACE_MAP_LARGE )
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.54.10.1 src/sys/arch/sparc/include/bus.h
cvs rdiff -u -r1.282.4.1 -r1.282.4.2 src/sys/arch/sparc/sparc/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/include/bus.h
diff -u src/sys/arch/sparc/include/bus.h:1.54 src/sys/arch/sparc/include/bus.h:1.54.10.1
--- src/sys/arch/sparc/include/bus.h:1.54 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/include/bus.h Sun Oct 18 13:43:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.54 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: bus.h,v 1.54.10.1 2009/10/18 13:43:45 bouyer Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -245,6 +245,7 @@
void (*)(void)); /*optional fast vector*/
+
static __inline int
bus_space_map(t, a, s, f, hp)
bus_space_tag_t t;
@@ -352,7 +353,7 @@
#define BUS_SPACE_MAP_BUS1 0x0100 /* placeholders for bus functions... */
#define BUS_SPACE_MAP_BUS2 0x0200
#define BUS_SPACE_MAP_BUS3 0x0400
-#define BUS_SPACE_MAP_BUS4 0x0800
+#define BUS_SPACE_MAP_LARGE 0x0800 /* map outside IODEV range */
/* flags for bus_space_barrier() */
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.282.4.1 src/sys/arch/sparc/sparc/machdep.c:1.282.4.2
--- src/sys/arch/sparc/sparc/machdep.c:1.282.4.1 Mon Feb 2 03:30:33 2009
+++ src/sys/arch/sparc/sparc/machdep.c Sun Oct 18 13:43:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.282.4.1 2009/02/02 03:30:33 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.282.4.2 2009/10/18 13:43:45 bouyer Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.282.4.1 2009/02/02 03:30:33 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.282.4.2 2009/10/18 13:43:45 bouyer Exp $);
#include opt_compat_netbsd.h
#include opt_compat_sunos.h
@@ -2127,8 +2127,8 @@
return (EINVAL);
}
-int
-sparc_bus_map(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
+static int
+sparc_bus_map_iodev(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
vaddr_t va, bus_space_handle_t *hp)
{
vaddr_t v;
@@ -2194,11 +2194,44 @@
return (0);
}
+static int
+sparc_bus_map_large(bus_space_tag_t t, bus_addr_t ba,
+ bus_size_t size, int flags, bus_space_handle_t *hp)
+{
+ vaddr_t v = 0;
+
+ if (uvm_map(kernel_map, v, size, NULL, 0, PAGE_SIZE,
+ UVM_MAPFLAG(UVM_PROT_RW, UVM_PROT_RW, UVM_INH_SHARE, UVM_ADV_NORMAL,
+ 0)) == 0) {
+ return sparc_bus_map_iodev(t, ba, size, flags, v, hp);
+ }
+ return -1;
+}
+
+int
+sparc_bus_map(bus_space_tag_t t, bus_addr_t ba,
+ bus_size_t size, int flags, vaddr_t va,
+ bus_space_handle_t *hp)
+{
+
+ if (flags BUS_SPACE_MAP_LARGE) {
+ return sparc_bus_map_large(t, ba, size, flags, hp);
+ } else
+ return sparc_bus_map_iodev(t, ba, size, flags, va, hp);
+
+}
+
int
sparc_bus_unmap(bus_space_tag_t t, bus_space_handle_t bh, bus_size_t size)
{
vaddr_t va = trunc_page((vaddr_t)bh);
+ /*
+ * XXX
+ * mappings with BUS_SPACE_MAP_LARGE need additional care here
+ * we can just check if the VA is in the IODEV range
+ */
+
pmap_kremove(va, round_page(size));
pmap_update(pmap_kernel());
return (0);
CVS commit: [netbsd-5] src/sys/arch/sparc64/dev
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 13:45:50 UTC 2009
Modified Files:
src/sys/arch/sparc64/dev [netbsd-5]: ffb.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #972):
sys/arch/sparc64/dev/ffb.c: revision 1.37
call vcons_replay_msgbuf() when appropriate
To generate a diff of this commit:
cvs rdiff -u -r1.35.4.1 -r1.35.4.2 src/sys/arch/sparc64/dev/ffb.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/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.35.4.1 src/sys/arch/sparc64/dev/ffb.c:1.35.4.2
--- src/sys/arch/sparc64/dev/ffb.c:1.35.4.1 Wed Feb 25 20:52:09 2009
+++ src/sys/arch/sparc64/dev/ffb.c Sun Oct 18 13:45:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.35.4.1 2009/02/25 20:52:09 snj Exp $ */
+/* $NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.35.4.1 2009/02/25 20:52:09 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $);
#include sys/types.h
#include sys/param.h
@@ -239,11 +239,12 @@
sc-sc_fb.fb_device = sc-sc_dv;
fb_attach(sc-sc_fb, sc-sc_console);
+ ffb_clearscreen(sc);
+
if (sc-sc_console) {
wsdisplay_cnattach(ffb_stdscreen, ri, 0, 0, defattr);
+ vcons_replay_msgbuf(ffb_console_screen);
}
-
- ffb_clearscreen(sc);
waa.console = sc-sc_console;
waa.scrdata = ffb_screenlist;
@@ -433,7 +434,6 @@
break;
#endif
}
-
return (-1);
}
CVS commit: [netbsd-5] src/sys/dev/sun
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 13:58:41 UTC 2009
Modified Files:
src/sys/dev/sun [netbsd-5]: cgsix.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #978):
sys/dev/sun/cgsix.c: revision 1.45
call vcons_replay_msgbuf() when appropriate
To generate a diff of this commit:
cvs rdiff -u -r1.38.6.5 -r1.38.6.6 src/sys/dev/sun/cgsix.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/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.38.6.5 src/sys/dev/sun/cgsix.c:1.38.6.6
--- src/sys/dev/sun/cgsix.c:1.38.6.5 Mon Mar 2 19:56:34 2009
+++ src/sys/dev/sun/cgsix.c Sun Oct 18 13:58:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.38.6.5 2009/03/02 19:56:34 snj Exp $ */
+/* $NetBSD: cgsix.c,v 1.38.6.6 2009/10/18 13:58:41 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.38.6.5 2009/03/02 19:56:34 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.38.6.6 2009/10/18 13:58:41 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -616,6 +616,9 @@
vcons_init(sc-vd, sc, cgsix_defaultscreen, cgsix_accessops);
sc-vd.init_screen = cgsix_init_screen;
+ cg6_setup_palette(sc);
+ cgsix_clearscreen(sc);
+
if(isconsole) {
/* we mess with cg6_console_screen only once */
vcons_init_screen(sc-vd, cg6_console_screen, 1,
@@ -628,7 +631,8 @@
cgsix_defaultscreen.ncols = ri-ri_cols;
SCREEN_VISIBLE(cg6_console_screen);
sc-vd.active = cg6_console_screen;
- wsdisplay_cnattach(cgsix_defaultscreen, ri, 0, 0, defattr);
+ wsdisplay_cnattach(cgsix_defaultscreen, ri, 0, 0, defattr);
+ vcons_replay_msgbuf(cg6_console_screen);
} else {
/*
* we're not the console so we just clear the screen and don't
@@ -649,9 +653,6 @@
cgsix_defaultscreen.ncols = ri-ri_cols;
}
}
-
- cg6_setup_palette(sc);
- cgsix_clearscreen(sc);
aa.scrdata = cgsix_screenlist;
aa.console = isconsole;
CVS commit: [netbsd-5] src/sys/dev/sun
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:00:07 UTC 2009 Modified Files: src/sys/dev/sun [netbsd-5]: fbio.h Log Message: Pull up following revision(s) (requested by macallan in ticket #991): sys/dev/sun/fbio.h: revision 1.10 add FBTYPE_SUNTCX - forgot to commit that along with the tcx(8) update found by he@ To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.74.1 src/sys/dev/sun/fbio.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/sun/fbio.h diff -u src/sys/dev/sun/fbio.h:1.8 src/sys/dev/sun/fbio.h:1.8.74.1 --- src/sys/dev/sun/fbio.h:1.8 Thu Apr 13 13:30:25 2006 +++ src/sys/dev/sun/fbio.h Sun Oct 18 14:00:07 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fbio.h,v 1.8 2006/04/13 13:30:25 macallan Exp $ */ +/* $NetBSD: fbio.h,v 1.8.74.1 2009/10/18 14:00:07 bouyer Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -72,8 +72,10 @@ #define FBTYPE_P9100 21 /* tadpole 3gx p9100 controller */ #define FBTYPE_CREATOR 22 /* ffb creator or elite */ #define FBTYPE_GENERIC_PCI 23 /* machfb, ofb and so on */ +#define FBTYPE_AG10E 24 /* Fujitsu AG-10e */ +#define FBTYPE_SUNTCX 25 /* Sun TCX, S24 */ -#define FBTYPE_LASTPLUSONE 24 /* max number of fbs (change as add) */ +#define FBTYPE_LASTPLUSONE 26 /* max number of fbs (change as add) */ /* * XXX These really shouldn't be here, but this is what the pmax
CVS commit: [netbsd-5] src/sys/arch/sparc/conf
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:01:50 UTC 2009 Modified Files: src/sys/arch/sparc/conf [netbsd-5]: MRCOFFEE Log Message: Pull up following revision(s) (requested by macallan in ticket #990): sys/arch/sparc/conf/MRCOFFEE: revision 1.29 add the missing wscons bits so this kernel builds again needs testing on actual hardware which I don't have. To generate a diff of this commit: cvs rdiff -u -r1.23.20.1 -r1.23.20.2 src/sys/arch/sparc/conf/MRCOFFEE 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/sparc/conf/MRCOFFEE diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.1 src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.2 --- src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.1 Fri Oct 16 06:30:02 2009 +++ src/sys/arch/sparc/conf/MRCOFFEE Sun Oct 18 14:01:49 2009 @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.23.20.1 2009/10/16 06:30:02 snj Exp $ +# $NetBSD: MRCOFFEE,v 1.23.20.2 2009/10/18 14:01:49 bouyer Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MRCOFFEE-$Revision: 1.23.20.1 $ +#ident MRCOFFEE-$Revision: 1.23.20.2 $ maxusers 32 @@ -29,16 +29,21 @@ # Blink the power LED on some machines to indicate the system load. #options BLINK -# XXX: uwe: TCX driver doesn't support RASTERCONSOLE, so don't bother -## Use a faster console than the PROM's slow drawing routines. Not needed -## for headless (no framebuffer) machines. -#options RASTERCONSOLE # fast rasterop console -#options FONT_GALLANT12x22 # the console font -#options FONT_BOLD8x16 # a somewhat smaller font -## default console colors: black-on-white; this can be changed -## using the following two options. -#options RASTERCONSOLE_FGCOL=WSCOL_BLACK -#options RASTERCONSOLE_BGCOL=WSCOL_WHITE +# builtin terminal emulations +options WSEMUL_SUN # sun terminal emulation +options WSEMUL_VT100 # VT100 / VT220 emulation +options WSEMUL_DEFAULT=\vt100\ + +# customization of console and kernel output - see dev/wscons/wsdisplayvar.h +options WSDISPLAY_COMPAT_RAWKBD +options WSDISPLAY_CUSTOM_OUTPUT +options WS_DEFAULT_FG=WSCOL_BLACK +options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE +options WS_KERNEL_FG=WSCOL_GREEN +options WS_KERNEL_BG=WSCOL_LIGHT_WHITE +options WSDISPLAY_SCROLLSUPPORT +options FONT_GALLANT12x22 # the console font + System options that are the same for all ports @@ -250,9 +255,14 @@ Keyboard and mouse pckbc0 at obio0 -kbd0 at pckbc0 -ms0 at pckbc0 - +#kbd0 at pckbc0 +#ms0 at pckbc0 +#wskbd* at kbd? console ? +#wsmouse* at ms? mux 0 +pckbd* at pckbc? # PC keyboard +pms* at pckbc? # PS/2 mouse for wsmouse +wskbd* at pckbd? console ? +wsmouse* at pms? mux 0 Disk controllers and disks @@ -316,7 +326,7 @@ ## Sun tcx accelerated color framebuffer. tcx0 at sbus? slot ? offset ? - +wsdisplay0 at tcx0 Other device configuration @@ -334,3 +344,6 @@ pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms + +pseudo-device wsmux # mouse and keyboard multiplexor +pseudo-device wsfont
CVS commit: [netbsd-5] src/sys/dev/sbus
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:06:36 UTC 2009 Modified Files: src/sys/dev/sbus [netbsd-5]: p9100reg.h Log Message: Pull up following revision(s) (requested by macallan in ticket #993): sys/dev/sbus/p9100reg.h: revision 1.5 add a bunch of register definitions To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/dev/sbus/p9100reg.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/sbus/p9100reg.h diff -u src/sys/dev/sbus/p9100reg.h:1.4 src/sys/dev/sbus/p9100reg.h:1.4.10.1 --- src/sys/dev/sbus/p9100reg.h:1.4 Mon Apr 28 20:23:57 2008 +++ src/sys/dev/sbus/p9100reg.h Sun Oct 18 14:06:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: p9100reg.h,v 1.4 2008/04/28 20:23:57 martin Exp $ */ +/* $NetBSD: p9100reg.h,v 1.4.10.1 2009/10/18 14:06:36 bouyer Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -50,7 +50,8 @@ #define DAC_INDX_AUTOINCR 0x01 #define DAC_VERSION 0x01 -#define DAC_POWER 0x05 +#define DAC_MISC_CLK0x02 +#define DAC_POWER_MGT 0x05 #define DAC_POWER_SCLK_DISABLE 0x10 #define DAC_POWER_DDOT_DISABLE 0x08 #define DAC_POWER_SYNC_DISABLE 0x04 @@ -58,7 +59,34 @@ #define DAC_POWER_ICLK_DISABLE 0x02 /* Disable internal DAC power */ #define DAC_POWER_IPWR_DISABLE 0x01 - +#define DAC_OPERATION 0x06 + #define DAC_SYNC_ON_GREEN 0x08 +#define DAC_PALETTE_CTRL 0x07 +#define DAC_PIXEL_FMT 0x0a +#define DAC_8BIT_CTRL 0x0b + #define DAC8_DIRECT_COLOR 0x01 +#define DAC_16BIT_CTRL 0x0c + #define DAC16_INDIRECT_COLOR0x00 + #define DAC16_DYNAMIC_COLOR 0x40 + #define DAC16_DIRECT_COLOR 0xc0 + #define DAC16_BYPASS_POLARITY 0x20 + #define DAC16_BIT_FILL_LINEAR 0x04 + #define DAC16_555 0x00 + #define DAC16_565 0x02 + #define DAC16_CONTIGUOUS0x01 +#define DAC_24BIT_CTRL 0x0d + #define DAC24_DIRECT_COLOR 0x01 +#define DAC_32BIT_CTRL 0x0e + #define DAC32_BYPASS_POLARITY 0x04 + #define DAC32_INDIRECT_COLOR0x00 + #define DAC32_DYNAMIC_COLOR 0x01 + #define DAC32_DIRECT_COLOR 0x03 +#define DAC_VCO_DIV 0x16 +#define DAC_PLL00x20 +#define DAC_MISC_1 0x70 +#define DAC_MISC_2 0x71 +#define DAC_MISC_3 0x72 + #define DAC_CURSOR_CTL 0x30 #define DAC_CURSOR_OFF 0x00 #define DAC_CURSOR_WIN 0x02 @@ -74,6 +102,51 @@ #define DAC_PIX_PLL 0x8e #define DAC_CURSOR_DATA 0x100 +/* main registers */ +#define SYS_CONF0x0004 /* System Configuration Register */ +#define BUFFER_WRITE_1 0x0200 /* writes got o buffer 1 */ +#define BUFFER_WRITE_0 0x /* writes go to buffer 0 */ +#define BUFFER_READ_1 0x0400 /* read from buffer 1 */ +#define BUFFER_READ_0 0x +#define MEM_SWAP_BITS 0x0800 /* swap bits when accessing VRAM */ +#define MEM_SWAP_BYTES 0x1000 /* swap bytes when accessing VRAM */ +#define MEM_SWAP_HWORDS 0x2000 /* swap halfwords when accessing VRAM */ +#define SHIFT_0 14 +#define SHIFT_1 17 +#define SHIFT_2 20 +#define SHIFT_3 29 +#define PIXEL_SHIFT 26 +#define SWAP_SHIFT 11 +/* this is what the 3GX manual says */ +#define SC_8BIT 2 +#define SC_16BIT3 +#define SC_24BIT7 +#define SC_32BIT5 + +/* video controller registers */ +#define VID_HCOUNTER0x104 +#define VID_HTOTAL 0x108 +#define VID_HSRE0x10c /* hsync raising edge */ +#define VID_HBRE0x110 /* hblank raising edge */ +#define VID_HBFE0x114 /* hblank falling edge */ +#define VID_HCNTPRLD0x118 /* hcounter preload */ +#define VID_VCOUNTER0x11c /* vcounter */ +#define VID_VLENGTH 0x120 /* lines, including blanks */ +#define VID_VSRE0x124 /* vsync raising edge */ +#define VID_VBRE0x128 /* vblank raising edge */ +#define VID_VBFE0x12c /* vblank falling edge */ +#define VID_VCNTPRLD0x130 /* vcounter preload */ +#define VID_SRADDR 0x134 /* screen repaint address */ +#define VID_SRTC0x138 /* screen repaint timing control */ +#define VID_QSFCNTR 0x13c /* QSF counter */ + +#define VID_MEM_CONFIG 0x184 /* memory config */ +#define VID_RFPERIOD0x188 /* refresh period */ +#define VID_RFCOUNT 0x18c /* refresh counter */ +#define VID_RLMAX 0x190 /* RAS low max */ +#define VID_RLCUR 0x194 /* RAS low current */ +#define VID_DACSYNC 0x198 /* read after last DAC access */ + #define ENGINE_STATUS 0x2000 /* drawing engine status register */ #define BLITTER_BUSY 0x8000 #define ENGINE_BUSY 0x4000 @@ -84,7 +157,7 @@ /* apparently bits 2-6 control
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Sun Oct 18 14:24:17 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: adrianp's ad clause is no more. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.55 src/distrib/notes/common/legal.common:1.56 --- src/distrib/notes/common/legal.common:1.55 Sun Oct 18 14:22:39 2009 +++ src/distrib/notes/common/legal.common Sun Oct 18 14:24:17 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.55 2009/10/18 14:22:39 snj Exp $ +.\ $NetBSD: legal.common,v 1.56 2009/10/18 14:24:17 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -111,9 +111,6 @@ .It This product includes software developed by Adam Glass. .It -This product includes software developed by Adrian Portelli -for the NetBSD project. -.It This product includes software developed by Advanced Risc Machines Ltd. .It
CVS commit: [netbsd-5] src/sys/dev/sbus
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:32:29 UTC 2009 Modified Files: src/sys/dev/sbus [netbsd-5]: files.sbus zx.c zxreg.h zxvar.h Log Message: Back out ticket 960 To generate a diff of this commit: cvs rdiff -u -r1.31.36.1 -r1.31.36.2 src/sys/dev/sbus/files.sbus cvs rdiff -u -r1.24.6.2 -r1.24.6.3 src/sys/dev/sbus/zx.c cvs rdiff -u -r1.5.4.2 -r1.5.4.3 src/sys/dev/sbus/zxreg.h cvs rdiff -u -r1.2.10.2 -r1.2.10.3 src/sys/dev/sbus/zxvar.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/sbus/files.sbus diff -u src/sys/dev/sbus/files.sbus:1.31.36.1 src/sys/dev/sbus/files.sbus:1.31.36.2 --- src/sys/dev/sbus/files.sbus:1.31.36.1 Sun Oct 18 13:23:31 2009 +++ src/sys/dev/sbus/files.sbus Sun Oct 18 14:32:29 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.sbus,v 1.31.36.1 2009/10/18 13:23:31 bouyer Exp $ +# $NetBSD: files.sbus,v 1.31.36.2 2009/10/18 14:32:29 bouyer Exp $ # # Config file and device description for machine-independent SBUS code. # Included by ports that need it. @@ -119,7 +119,7 @@ attach tcx at sbus file dev/sbus/tcx.c tcx needs-flag -device zx: fb, rasops32, wsemuldisplaydev, vcons +device zx: fb, rasops32 attach zx at sbus file dev/sbus/zx.c zx Index: src/sys/dev/sbus/zx.c diff -u src/sys/dev/sbus/zx.c:1.24.6.2 src/sys/dev/sbus/zx.c:1.24.6.3 --- src/sys/dev/sbus/zx.c:1.24.6.2 Sun Oct 18 13:23:31 2009 +++ src/sys/dev/sbus/zx.c Sun Oct 18 14:32:29 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: zx.c,v 1.24.6.2 2009/10/18 13:23:31 bouyer Exp $ */ +/* $NetBSD: zx.c,v 1.24.6.3 2009/10/18 14:32:29 bouyer Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.24.6.2 2009/10/18 13:23:31 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.24.6.3 2009/10/18 14:32:29 bouyer Exp $); #include sys/param.h #include sys/systm.h @@ -66,58 +66,45 @@ #include dev/sun/fbio.h #include dev/sun/fbvar.h -#include wsdisplay.h -#if NWSDISPLAY 0 -#include dev/wscons/wsconsio.h -#include dev/wsfont/wsfont.h -#include dev/rasops/rasops.h -#include dev/wscons/wsdisplay_vconsvar.h - -#include opt_wsemul.h -#endif - #include dev/sbus/zxreg.h #include dev/sbus/zxvar.h #include dev/sbus/sbusvar.h #include dev/wscons/wsconsio.h -#if (NWSDISPLAY == 0) !defined(RASTERCONSOLE) -#error Sorry, this driver needs WSCONS or RASTERCONSOLE -#endif - -#if (NWSDISPLAY 0) defined(RASTERCONSOLE) -#error Sorry, RASTERCONSOLE and WSCONS are mutually exclusive +#ifndef RASTERCONSOLE +#error Sorry, this driver needs the RASTERCONSOLE option #endif #define ZX_STD_ROP (ZX_ROP_NEW | ZX_ATTR_WE_ENABLE | \ ZX_ATTR_OE_ENABLE | ZX_ATTR_FORCE_WID) -static void zx_attach(device_t, device_t, void *); -static int zx_match(device_t, struct cfdata *, void *); +void zx_attach(struct device *, struct device *, void *); +int zx_match(struct device *, struct cfdata *, void *); -static void zx_blank(device_t); -static int zx_cmap_put(struct zx_softc *); -static void zx_copyrect(struct zx_softc *, int, int, int, int, int, int); -static int zx_cross_loadwid(struct zx_softc *, u_int, u_int, u_int); -static int zx_cross_wait(struct zx_softc *); -static void zx_fillrect(struct zx_softc *, int, int, int, int, uint32_t, int); -static int zx_intr(void *); -static void zx_reset(struct zx_softc *); -static void zx_unblank(device_t); - -static void zx_cursor_blank(struct zx_softc *); -static void zx_cursor_color(struct zx_softc *); -static void zx_cursor_move(struct zx_softc *); -static void zx_cursor_set(struct zx_softc *); -static void zx_cursor_unblank(struct zx_softc *); - -static void zx_copycols(void *, int, int, int, int); -static void zx_copyrows(void *, int, int, int); -static void zx_do_cursor(void *, int, int, int); -static void zx_erasecols(void *, int, int, int, long); -static void zx_eraserows(void *, int, int, long); -static void zx_putchar(void *, int, int, u_int, long); +void zx_blank(struct device *); +int zx_cmap_put(struct zx_softc *); +void zx_copyrect(struct rasops_info *, int, int, int, int, int, int); +int zx_cross_loadwid(struct zx_softc *, u_int, u_int, u_int); +int zx_cross_wait(struct zx_softc *); +void zx_fillrect(struct rasops_info *, int, int, int, int, long, int); +int zx_intr(void *); +void zx_reset(struct zx_softc *); +void zx_unblank(struct device *); + +void zx_cursor_blank(struct zx_softc *); +void zx_cursor_color(struct zx_softc *); +void zx_cursor_move(struct zx_softc *); +void zx_cursor_set(struct zx_softc *); +void zx_cursor_unblank(struct zx_softc *); + +void zx_copycols(void *, int, int, int, int); +void zx_copyrows(void *, int, int, int); +void zx_cursor(void *, int, int, int); +void zx_do_cursor(struct rasops_info *); +void zx_erasecols(void *, int, int, int, long); +void zx_eraserows(void *, int, int, long); +void zx_putchar(void *, int, int, u_int, long); struct
CVS commit: [netbsd-5] src/sys/dev/sbus
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:34:58 UTC 2009 Modified Files: src/sys/dev/sbus [netbsd-5]: p9100reg.h Log Message: back out ticket #993 To generate a diff of this commit: cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/sys/dev/sbus/p9100reg.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/sbus/p9100reg.h diff -u src/sys/dev/sbus/p9100reg.h:1.4.10.1 src/sys/dev/sbus/p9100reg.h:1.4.10.2 --- src/sys/dev/sbus/p9100reg.h:1.4.10.1 Sun Oct 18 14:06:36 2009 +++ src/sys/dev/sbus/p9100reg.h Sun Oct 18 14:34:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: p9100reg.h,v 1.4.10.1 2009/10/18 14:06:36 bouyer Exp $ */ +/* $NetBSD: p9100reg.h,v 1.4.10.2 2009/10/18 14:34:58 bouyer Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -50,8 +50,7 @@ #define DAC_INDX_AUTOINCR 0x01 #define DAC_VERSION 0x01 -#define DAC_MISC_CLK0x02 -#define DAC_POWER_MGT 0x05 +#define DAC_POWER 0x05 #define DAC_POWER_SCLK_DISABLE 0x10 #define DAC_POWER_DDOT_DISABLE 0x08 #define DAC_POWER_SYNC_DISABLE 0x04 @@ -59,34 +58,7 @@ #define DAC_POWER_ICLK_DISABLE 0x02 /* Disable internal DAC power */ #define DAC_POWER_IPWR_DISABLE 0x01 -#define DAC_OPERATION 0x06 - #define DAC_SYNC_ON_GREEN 0x08 -#define DAC_PALETTE_CTRL 0x07 -#define DAC_PIXEL_FMT 0x0a -#define DAC_8BIT_CTRL 0x0b - #define DAC8_DIRECT_COLOR 0x01 -#define DAC_16BIT_CTRL 0x0c - #define DAC16_INDIRECT_COLOR0x00 - #define DAC16_DYNAMIC_COLOR 0x40 - #define DAC16_DIRECT_COLOR 0xc0 - #define DAC16_BYPASS_POLARITY 0x20 - #define DAC16_BIT_FILL_LINEAR 0x04 - #define DAC16_555 0x00 - #define DAC16_565 0x02 - #define DAC16_CONTIGUOUS0x01 -#define DAC_24BIT_CTRL 0x0d - #define DAC24_DIRECT_COLOR 0x01 -#define DAC_32BIT_CTRL 0x0e - #define DAC32_BYPASS_POLARITY 0x04 - #define DAC32_INDIRECT_COLOR0x00 - #define DAC32_DYNAMIC_COLOR 0x01 - #define DAC32_DIRECT_COLOR 0x03 -#define DAC_VCO_DIV 0x16 -#define DAC_PLL00x20 -#define DAC_MISC_1 0x70 -#define DAC_MISC_2 0x71 -#define DAC_MISC_3 0x72 - + #define DAC_CURSOR_CTL 0x30 #define DAC_CURSOR_OFF 0x00 #define DAC_CURSOR_WIN 0x02 @@ -102,51 +74,6 @@ #define DAC_PIX_PLL 0x8e #define DAC_CURSOR_DATA 0x100 -/* main registers */ -#define SYS_CONF0x0004 /* System Configuration Register */ -#define BUFFER_WRITE_1 0x0200 /* writes got o buffer 1 */ -#define BUFFER_WRITE_0 0x /* writes go to buffer 0 */ -#define BUFFER_READ_1 0x0400 /* read from buffer 1 */ -#define BUFFER_READ_0 0x -#define MEM_SWAP_BITS 0x0800 /* swap bits when accessing VRAM */ -#define MEM_SWAP_BYTES 0x1000 /* swap bytes when accessing VRAM */ -#define MEM_SWAP_HWORDS 0x2000 /* swap halfwords when accessing VRAM */ -#define SHIFT_0 14 -#define SHIFT_1 17 -#define SHIFT_2 20 -#define SHIFT_3 29 -#define PIXEL_SHIFT 26 -#define SWAP_SHIFT 11 -/* this is what the 3GX manual says */ -#define SC_8BIT 2 -#define SC_16BIT3 -#define SC_24BIT7 -#define SC_32BIT5 - -/* video controller registers */ -#define VID_HCOUNTER0x104 -#define VID_HTOTAL 0x108 -#define VID_HSRE0x10c /* hsync raising edge */ -#define VID_HBRE0x110 /* hblank raising edge */ -#define VID_HBFE0x114 /* hblank falling edge */ -#define VID_HCNTPRLD0x118 /* hcounter preload */ -#define VID_VCOUNTER0x11c /* vcounter */ -#define VID_VLENGTH 0x120 /* lines, including blanks */ -#define VID_VSRE0x124 /* vsync raising edge */ -#define VID_VBRE0x128 /* vblank raising edge */ -#define VID_VBFE0x12c /* vblank falling edge */ -#define VID_VCNTPRLD0x130 /* vcounter preload */ -#define VID_SRADDR 0x134 /* screen repaint address */ -#define VID_SRTC0x138 /* screen repaint timing control */ -#define VID_QSFCNTR 0x13c /* QSF counter */ - -#define VID_MEM_CONFIG 0x184 /* memory config */ -#define VID_RFPERIOD0x188 /* refresh period */ -#define VID_RFCOUNT 0x18c /* refresh counter */ -#define VID_RLMAX 0x190 /* RAS low max */ -#define VID_RLCUR 0x194 /* RAS low current */ -#define VID_DACSYNC 0x198 /* read after last DAC access */ - #define ENGINE_STATUS 0x2000 /* drawing engine status register */ #define BLITTER_BUSY 0x8000 #define ENGINE_BUSY 0x4000 @@ -157,7 +84,7 @@ /* apparently bits 2-6 control how many pixels we write - n+1 */ /* drawing engine registers */ -#define COORD_INDEX 0x218c +#define
CVS commit: [netbsd-5] src/sys/arch/sparc/conf
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:36:30 UTC 2009 Modified Files: src/sys/arch/sparc/conf [netbsd-5]: MRCOFFEE Log Message: Back out ticket 990 To generate a diff of this commit: cvs rdiff -u -r1.23.20.2 -r1.23.20.3 src/sys/arch/sparc/conf/MRCOFFEE 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/sparc/conf/MRCOFFEE diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.2 src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.3 --- src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.2 Sun Oct 18 14:01:49 2009 +++ src/sys/arch/sparc/conf/MRCOFFEE Sun Oct 18 14:36:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.23.20.2 2009/10/18 14:01:49 bouyer Exp $ +# $NetBSD: MRCOFFEE,v 1.23.20.3 2009/10/18 14:36:30 bouyer Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MRCOFFEE-$Revision: 1.23.20.2 $ +#ident MRCOFFEE-$Revision: 1.23.20.3 $ maxusers 32 @@ -29,21 +29,16 @@ # Blink the power LED on some machines to indicate the system load. #options BLINK -# builtin terminal emulations -options WSEMUL_SUN # sun terminal emulation -options WSEMUL_VT100 # VT100 / VT220 emulation -options WSEMUL_DEFAULT=\vt100\ - -# customization of console and kernel output - see dev/wscons/wsdisplayvar.h -options WSDISPLAY_COMPAT_RAWKBD -options WSDISPLAY_CUSTOM_OUTPUT -options WS_DEFAULT_FG=WSCOL_BLACK -options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE -options WS_KERNEL_FG=WSCOL_GREEN -options WS_KERNEL_BG=WSCOL_LIGHT_WHITE -options WSDISPLAY_SCROLLSUPPORT -options FONT_GALLANT12x22 # the console font - +# XXX: uwe: TCX driver doesn't support RASTERCONSOLE, so don't bother +## Use a faster console than the PROM's slow drawing routines. Not needed +## for headless (no framebuffer) machines. +#options RASTERCONSOLE # fast rasterop console +#options FONT_GALLANT12x22 # the console font +#options FONT_BOLD8x16 # a somewhat smaller font +## default console colors: black-on-white; this can be changed +## using the following two options. +#options RASTERCONSOLE_FGCOL=WSCOL_BLACK +#options RASTERCONSOLE_BGCOL=WSCOL_WHITE System options that are the same for all ports @@ -255,14 +250,9 @@ Keyboard and mouse pckbc0 at obio0 -#kbd0 at pckbc0 -#ms0 at pckbc0 -#wskbd* at kbd? console ? -#wsmouse* at ms? mux 0 -pckbd* at pckbc? # PC keyboard -pms* at pckbc? # PS/2 mouse for wsmouse -wskbd* at pckbd? console ? -wsmouse* at pms? mux 0 +kbd0 at pckbc0 +ms0 at pckbc0 + Disk controllers and disks @@ -326,7 +316,7 @@ ## Sun tcx accelerated color framebuffer. tcx0 at sbus? slot ? offset ? -wsdisplay0 at tcx0 + Other device configuration @@ -344,6 +334,3 @@ pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms - -pseudo-device wsmux # mouse and keyboard multiplexor -pseudo-device wsfont
CVS commit: [netbsd-5] src/sys/dev/sun
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:37:32 UTC 2009 Modified Files: src/sys/dev/sun [netbsd-5]: fbio.h Log Message: Back out ticket 991 To generate a diff of this commit: cvs rdiff -u -r1.8.74.1 -r1.8.74.2 src/sys/dev/sun/fbio.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/sun/fbio.h diff -u src/sys/dev/sun/fbio.h:1.8.74.1 src/sys/dev/sun/fbio.h:1.8.74.2 --- src/sys/dev/sun/fbio.h:1.8.74.1 Sun Oct 18 14:00:07 2009 +++ src/sys/dev/sun/fbio.h Sun Oct 18 14:37:32 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fbio.h,v 1.8.74.1 2009/10/18 14:00:07 bouyer Exp $ */ +/* $NetBSD: fbio.h,v 1.8.74.2 2009/10/18 14:37:32 bouyer Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -72,10 +72,8 @@ #define FBTYPE_P9100 21 /* tadpole 3gx p9100 controller */ #define FBTYPE_CREATOR 22 /* ffb creator or elite */ #define FBTYPE_GENERIC_PCI 23 /* machfb, ofb and so on */ -#define FBTYPE_AG10E 24 /* Fujitsu AG-10e */ -#define FBTYPE_SUNTCX 25 /* Sun TCX, S24 */ -#define FBTYPE_LASTPLUSONE 26 /* max number of fbs (change as add) */ +#define FBTYPE_LASTPLUSONE 24 /* max number of fbs (change as add) */ /* * XXX These really shouldn't be here, but this is what the pmax
CVS commit: [netbsd-5] src/sys/arch/sparc64/dev
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 14:39:38 UTC 2009
Modified Files:
src/sys/arch/sparc64/dev [netbsd-5]: ffb.c
Log Message:
back out ticket 972
To generate a diff of this commit:
cvs rdiff -u -r1.35.4.2 -r1.35.4.3 src/sys/arch/sparc64/dev/ffb.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/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.35.4.2 src/sys/arch/sparc64/dev/ffb.c:1.35.4.3
--- src/sys/arch/sparc64/dev/ffb.c:1.35.4.2 Sun Oct 18 13:45:50 2009
+++ src/sys/arch/sparc64/dev/ffb.c Sun Oct 18 14:39:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $ */
+/* $NetBSD: ffb.c,v 1.35.4.3 2009/10/18 14:39:37 bouyer Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.35.4.3 2009/10/18 14:39:37 bouyer Exp $);
#include sys/types.h
#include sys/param.h
@@ -239,12 +239,11 @@
sc-sc_fb.fb_device = sc-sc_dv;
fb_attach(sc-sc_fb, sc-sc_console);
- ffb_clearscreen(sc);
-
if (sc-sc_console) {
wsdisplay_cnattach(ffb_stdscreen, ri, 0, 0, defattr);
- vcons_replay_msgbuf(ffb_console_screen);
}
+
+ ffb_clearscreen(sc);
waa.console = sc-sc_console;
waa.scrdata = ffb_screenlist;
@@ -434,6 +433,7 @@
break;
#endif
}
+
return (-1);
}
CVS commit: [netbsd-5] src/sys/arch/sparc
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 14:40:40 UTC 2009
Modified Files:
src/sys/arch/sparc/include [netbsd-5]: bus.h
src/sys/arch/sparc/sparc [netbsd-5]: machdep.c
Log Message:
Back out ticket 969
To generate a diff of this commit:
cvs rdiff -u -r1.54.10.1 -r1.54.10.2 src/sys/arch/sparc/include/bus.h
cvs rdiff -u -r1.282.4.2 -r1.282.4.3 src/sys/arch/sparc/sparc/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/include/bus.h
diff -u src/sys/arch/sparc/include/bus.h:1.54.10.1 src/sys/arch/sparc/include/bus.h:1.54.10.2
--- src/sys/arch/sparc/include/bus.h:1.54.10.1 Sun Oct 18 13:43:45 2009
+++ src/sys/arch/sparc/include/bus.h Sun Oct 18 14:40:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.54.10.1 2009/10/18 13:43:45 bouyer Exp $ */
+/* $NetBSD: bus.h,v 1.54.10.2 2009/10/18 14:40:40 bouyer Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -245,7 +245,6 @@
void (*)(void)); /*optional fast vector*/
-
static __inline int
bus_space_map(t, a, s, f, hp)
bus_space_tag_t t;
@@ -353,7 +352,7 @@
#define BUS_SPACE_MAP_BUS1 0x0100 /* placeholders for bus functions... */
#define BUS_SPACE_MAP_BUS2 0x0200
#define BUS_SPACE_MAP_BUS3 0x0400
-#define BUS_SPACE_MAP_LARGE 0x0800 /* map outside IODEV range */
+#define BUS_SPACE_MAP_BUS4 0x0800
/* flags for bus_space_barrier() */
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.282.4.2 src/sys/arch/sparc/sparc/machdep.c:1.282.4.3
--- src/sys/arch/sparc/sparc/machdep.c:1.282.4.2 Sun Oct 18 13:43:45 2009
+++ src/sys/arch/sparc/sparc/machdep.c Sun Oct 18 14:40:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.282.4.2 2009/10/18 13:43:45 bouyer Exp $ */
+/* $NetBSD: machdep.c,v 1.282.4.3 2009/10/18 14:40:40 bouyer Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.282.4.2 2009/10/18 13:43:45 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.282.4.3 2009/10/18 14:40:40 bouyer Exp $);
#include opt_compat_netbsd.h
#include opt_compat_sunos.h
@@ -2127,8 +2127,8 @@
return (EINVAL);
}
-static int
-sparc_bus_map_iodev(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
+int
+sparc_bus_map(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
vaddr_t va, bus_space_handle_t *hp)
{
vaddr_t v;
@@ -2194,44 +2194,11 @@
return (0);
}
-static int
-sparc_bus_map_large(bus_space_tag_t t, bus_addr_t ba,
- bus_size_t size, int flags, bus_space_handle_t *hp)
-{
- vaddr_t v = 0;
-
- if (uvm_map(kernel_map, v, size, NULL, 0, PAGE_SIZE,
- UVM_MAPFLAG(UVM_PROT_RW, UVM_PROT_RW, UVM_INH_SHARE, UVM_ADV_NORMAL,
- 0)) == 0) {
- return sparc_bus_map_iodev(t, ba, size, flags, v, hp);
- }
- return -1;
-}
-
-int
-sparc_bus_map(bus_space_tag_t t, bus_addr_t ba,
- bus_size_t size, int flags, vaddr_t va,
- bus_space_handle_t *hp)
-{
-
- if (flags BUS_SPACE_MAP_LARGE) {
- return sparc_bus_map_large(t, ba, size, flags, hp);
- } else
- return sparc_bus_map_iodev(t, ba, size, flags, va, hp);
-
-}
-
int
sparc_bus_unmap(bus_space_tag_t t, bus_space_handle_t bh, bus_size_t size)
{
vaddr_t va = trunc_page((vaddr_t)bh);
- /*
- * XXX
- * mappings with BUS_SPACE_MAP_LARGE need additional care here
- * we can just check if the VA is in the IODEV range
- */
-
pmap_kremove(va, round_page(size));
pmap_update(pmap_kernel());
return (0);
CVS commit: [netbsd-5] src/sys/arch/sparc/conf
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:43:09 UTC 2009 Modified Files: src/sys/arch/sparc/conf [netbsd-5]: INSTALL Log Message: Back out ticket 968 To generate a diff of this commit: cvs rdiff -u -r1.62.4.1 -r1.62.4.2 src/sys/arch/sparc/conf/INSTALL 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/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.62.4.1 src/sys/arch/sparc/conf/INSTALL:1.62.4.2 --- src/sys/arch/sparc/conf/INSTALL:1.62.4.1 Sun Oct 18 13:35:29 2009 +++ src/sys/arch/sparc/conf/INSTALL Sun Oct 18 14:43:09 2009 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.62.4.1 2009/10/18 13:35:29 bouyer Exp $ +# $NetBSD: INSTALL,v 1.62.4.2 2009/10/18 14:43:09 bouyer Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -47,16 +47,6 @@ #options RASTERCONSOLE_FGCOL=WSCOL_BLACK #options RASTERCONSOLE_BGCOL=WSCOL_WHITE -# wscons stuff -options WSEMUL_SUN -#options WSEMUL_VT100 -options WSDISPLAY_COMPAT_RAWKBD -options WSDISPLAY_CUSTOM_OUTPUT -options WS_DEFAULT_FG=WSCOL_BLACK -options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE -options WS_KERNEL_FG=WSCOL_GREEN -options WS_KERNEL_BG=WSCOL_LIGHT_WHITE - System options that are the same for all ports ## Root device configuration: change the ?'s if you are going to use a @@ -280,21 +270,20 @@ zs0 at obio0 # sun4m zs0 at obio0 addr 0xf100 level 12 flags 0x103 # sun4/200 and sun4/300 zs0 at obio0 addr 0x0100 level 12 flags 0x103 # sun4/100 +zstty0 at zs0 channel 0 # ttya +zstty1 at zs0 channel 1 # ttyb zs1 at mainbus0 # sun4c zs1 at obio0 # sun4m zs1 at obio0 addr 0xf000 level 12 flags 0x103 # sun4/200 and sun4/300 zs1 at obio0 addr 0x level 12 flags 0x103 # sun4/100 +kbd0 at zs1 channel 0 # keyboard +ms0 at zs1 channel 1 # mouse -zs2 at obio0 addr 0xe000 level 12 # sun4/300 - -zstty* at zs? +zs2 at obio0 addr 0xe000 level 12 flags 0x103 # sun4/300 +zstty2 at zs2 channel 0 # ttyc +zstty3 at zs2 channel 1 # ttyd -# these are for wscons -kbd0 at zstty? -ms0 at zstty? -wskbd* at wskbddev? -wsmouse* at wsmousedev? ## Magma Serial/Parallel driver #magma* at sbus? slot ? offset ? @@ -556,28 +545,12 @@ #cgeight0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 ## Sun tcx accelerated color framebuffer. -#tcx0 at sbus? slot ? offset ? -#tcx* at sbus? slot ? offset ? +tcx0 at sbus? slot ? offset ? +tcx* at sbus? slot ? offset ? # Sun cgfourteen accelerated 24-bit framebuffer. -cgfourteen* at obio0 # sun4m - -# P9100-based display on Tadpole SPARCbook 3. -pnozz0 at sbus? slot ? offset ? - -# Sun ZX/Leo 24-bit framebuffer -# XXX no wsdisplay support -#zx* at sbus? slot ? offset ? +cgfourteen0 at obio0 # sun4m -# Fujitsu AG-10e accelerated graphics 8/24-bit board -agten* at sbus? slot ? offset ? - -# generic framebuffer console -genfb* at sbus? slot ? offset ? - -# make sure wsdisplay0 is the console -wsdisplay0 at wsemuldisplaydev? console 1 -wsdisplay* at wsemuldisplaydev? Other device configuration @@ -590,6 +563,3 @@ pseudo-device rnd #pseudo-device fss 4 # file system snapshot device - -pseudo-device wsmux # mouse and keyboard multiplexor -pseudo-device wsfont
CVS commit: [netbsd-5] src/sys/arch/sparc64/include
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:44:12 UTC 2009 Modified Files: src/sys/arch/sparc64/include [netbsd-5]: bus.h Log Message: Back out ticket 967 To generate a diff of this commit: cvs rdiff -u -r1.58.10.1 -r1.58.10.2 src/sys/arch/sparc64/include/bus.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/include/bus.h diff -u src/sys/arch/sparc64/include/bus.h:1.58.10.1 src/sys/arch/sparc64/include/bus.h:1.58.10.2 --- src/sys/arch/sparc64/include/bus.h:1.58.10.1 Sun Oct 18 13:34:49 2009 +++ src/sys/arch/sparc64/include/bus.h Sun Oct 18 14:44:12 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bus.h,v 1.58.10.1 2009/10/18 13:34:49 bouyer Exp $ */ +/* $NetBSD: bus.h,v 1.58.10.2 2009/10/18 14:44:12 bouyer Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -307,8 +307,7 @@ #define BUS_SPACE_MAP_BUS2 0x0200 #define BUS_SPACE_MAP_BUS3 0x0400 #define BUS_SPACE_MAP_BUS4 0x0800 -/* sparc uses this, it's not supposed to do anything on sparc64 */ -#define BUS_SPACE_MAP_LARGE 0 + /* flags for bus_space_barrier() */ #define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */
CVS commit: [netbsd-5] src/sys/arch/sparc/conf
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:45:54 UTC 2009 Modified Files: src/sys/arch/sparc/conf [netbsd-5]: GENERIC Log Message: Back out 965 To generate a diff of this commit: cvs rdiff -u -r1.205.4.2 -r1.205.4.3 src/sys/arch/sparc/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.205.4.2 src/sys/arch/sparc/conf/GENERIC:1.205.4.3 --- src/sys/arch/sparc/conf/GENERIC:1.205.4.2 Sun Oct 18 13:33:29 2009 +++ src/sys/arch/sparc/conf/GENERIC Sun Oct 18 14:45:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.205.4.2 2009/10/18 13:33:29 bouyer Exp $ +# $NetBSD: GENERIC,v 1.205.4.3 2009/10/18 14:45:54 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.205.4.2 $ +#ident GENERIC-$Revision: 1.205.4.3 $ maxusers 32 @@ -45,29 +45,13 @@ ## Use a faster console than the PROM's slow drawing routines. Not needed ## for headless (no framebuffer) machines. -## These is obsolete for wscons kernels -#options RASTERCONSOLE # fast rasterop console -#options RASTERCONSOLE_FGCOL=WSCOL_BLACK -#options RASTERCONSOLE_BGCOL=WSCOL_WHITE - -# wscons stuff -options WSEMUL_SUN -#options WSEMUL_VT100 -options WSDISPLAY_COMPAT_RAWKBD -options WSDISPLAY_CUSTOM_OUTPUT -options WS_DEFAULT_FG=WSCOL_BLACK -options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE -options WS_KERNEL_FG=WSCOL_GREEN -options WS_KERNEL_BG=WSCOL_LIGHT_WHITE -options WSDISPLAY_COMPAT_PCVT -options WSDISPLAY_COMPAT_SYSCONS -options WSDISPLAY_COMPAT_USL - -options WSDISPLAY_SCROLLSUPPORT - -# generic options vlid for both wscons and RASTERCONSOLE +options RASTERCONSOLE # fast rasterop console options FONT_GALLANT12x22 # the console font #options FONT_BOLD8x16 # a somewhat smaller font +## default console colors: black-on-white; this can be changed +## using the following two options. +#options RASTERCONSOLE_FGCOL=WSCOL_BLACK +#options RASTERCONSOLE_BGCOL=WSCOL_WHITE System options that are the same for all ports @@ -332,23 +316,16 @@ zs0 at obio0 addr 0xf100 level 12 # sun4/200 and sun4/300 zs0 at obio0 addr 0x0100 level 12 # sun4/100 zs0 at bootbus0 # sun4d +zstty0 at zs0 channel 0# ttya +zstty1 at zs0 channel 1# ttyb zs1 at mainbus0 # sun4c zs1 at obio0 # sun4m zs1 at obio0 addr 0xf000 level 12 # sun4/200 and sun4/300 zs1 at obio0 addr 0x level 12 # sun4/100 zs1 at bootbus0 # sun4d - -# old kbd and mouse attachments -#kbd0 at zs1 channel 0# keyboard -#ms0 at zs1 channel 1# mouse -zstty* at zs? - -# these are for wscons -kbd0 at zstty? -ms0 at zstty? -wskbd* at wskbddev? -wsmouse* at wsmousedev? +kbd0 at zs1 channel 0# keyboard +ms0 at zs1 channel 1# mouse zs2 at obio0 addr 0xe000 level 12 # sun4/300 zstty2 at zs2 channel 0# ttyc @@ -660,8 +637,7 @@ bwtwo0 at obio0 addr 0x0b30 level 4 # sun4/100 in P4 slot ## Sun cgtwo VME color framebuffer -# XXX no wsdisplay support -#cgtwo0 at vme0 addr 0x40 irq ? vect 0xa8 +cgtwo0 at vme0 addr 0x40 irq ? vect 0xa8 ## Sun cgthree Sbus color framebuffer cgthree0 at sbus? slot ? offset ? @@ -670,9 +646,8 @@ ## Sun cgfour color framebuffer with overlay plane. See above comment ## regarding overlay plane. -# XXX no wsdisplay support -#cgfour0 at obio0 addr 0xfb30 level 4 # sun4/300 P4 -#cgfour0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 +cgfour0 at obio0 addr 0xfb30 level 4 # sun4/300 P4 +cgfour0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 ## Sun cgsix accelerated color framebuffer. cgsix0 at sbus? slot ? offset ? @@ -681,31 +656,21 @@ cgsix0 at obio0 addr 0x0b00 level 4 # sun4/100 P4 ## Sun cgeight 24-bit framebuffer -# XXX no wsdisplay support -#cgeight0 at obio0 addr 0xfb30 level 4 # sun4/300 P4 -#cgeight0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 +cgeight0 at obio0 addr 0xfb30 level 4 # sun4/300 P4 +cgeight0 at obio0 addr 0x0b30 level 4 # sun4/100 P4 ## Sun tcx accelerated color framebuffer. -# XXX no wsdisplay support -#tcx0 at sbus? slot ? offset ? -#tcx* at sbus? slot ? offset ? +tcx0 at sbus? slot ? offset ? +tcx* at sbus? slot ? offset ? # Sun cgfourteen accelerated 24-bit framebuffer. -cgfourteen* at obio0 # sun4m +cgfourteen0 at obio0 # sun4m # P9100-based display on Tadpole SPARCbook 3. pnozz0 at sbus? slot ? offset ? # Sun ZX/Leo 24-bit framebuffer -# XXX no wsdisplay support -#zx* at sbus? slot ? offset ? - -# Fujitsu AG-10e accelerated graphics 8/24-bit board -agten* at sbus? slot ? offset ? - -# make sure wsdisplay0 is the console -wsdisplay0 at wsemuldisplaydev? console 1 -wsdisplay* at wsemuldisplaydev? +zx* at sbus? slot ? offset ? Other device configuration
CVS commit: [netbsd-5] src/etc/etc.sparc
Module Name:src Committed By: bouyer Date: Sun Oct 18 14:47:00 UTC 2009 Modified Files: src/etc/etc.sparc [netbsd-5]: ttys Log Message: Back out 961 To generate a diff of this commit: cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/etc/etc.sparc/ttys Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.sparc/ttys diff -u src/etc/etc.sparc/ttys:1.14.2.1 src/etc/etc.sparc/ttys:1.14.2.2 --- src/etc/etc.sparc/ttys:1.14.2.1 Sun Oct 18 13:27:34 2009 +++ src/etc/etc.sparc/ttys Sun Oct 18 14:47:00 2009 @@ -1,16 +1,10 @@ -# $NetBSD: ttys,v 1.14.2.1 2009/10/18 13:27:34 bouyer Exp $ +# $NetBSD: ttys,v 1.14.2.2 2009/10/18 14:47:00 bouyer Exp $ # # @(#)ttys 5.1 (Berkeley) 4/17/89 # # name gettytype status comments # -console /usr/libexec/getty suncons sun-ss5 on secure -constty /usr/libexec/getty suncons sun-ss5 off secure -ttyE0 /usr/libexec/getty suncons sun-ss5 off secure -ttyE1 /usr/libexec/getty suncons sun-ss5 off secure -ttyE2 /usr/libexec/getty suncons sun-ss5 off secure -ttyE3 /usr/libexec/getty suncons sun-ss5 off secure +console /usr/libexec/getty suncons sun on secure +constty /usr/libexec/getty suncons sun off secure ttya /usr/libexec/getty std.9600 unknown off secure ttyb /usr/libexec/getty std.9600 unknown off secure -ttyh0 /usr/libexec/getty std.9600 unknown off secure -ttyh1 /usr/libexec/getty std.9600 unknown off secure
CVS commit: src/usr.sbin/puffs/rump_smbfs
Module Name:src Committed By: pooka Date: Sun Oct 18 15:14:13 UTC 2009 Modified Files: src/usr.sbin/puffs/rump_smbfs: rump_smbfs.c Log Message: Use PUFFS_KFLAG_WTCACHE since it's sensible for a distributed file server (plus it makes write work in the first place since the descriptors don't get closed before the cache is flushed). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c diff -u src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.1 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.2 --- src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.1 Sun Sep 6 20:26:47 2009 +++ src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c Sun Oct 18 15:14:13 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_smbfs.c,v 1.1 2009/09/06 20:26:47 pooka Exp $ */ +/* $NetBSD: rump_smbfs.c,v 1.2 2009/10/18 15:14:13 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -62,7 +62,7 @@ canon_dev, canon_dir); rv = p2k_run_fs(MOUNT_SMBFS, canon_dev, canon_dir, mntflags, args, - sizeof(args), 0); + sizeof(args), PUFFS_KFLAG_WTCACHE); if (rv == -1) err(1, mount);
CVS commit: [netbsd-4] src/sys/arch/i386/include
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 15:17:30 UTC 2009
Modified Files:
src/sys/arch/i386/include [netbsd-4]: npx.h
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1362):
sys/arch/i386/include/npx.h: revision 1.23
The FPU Tag word is a 16bit register, in FPU (387) mode it
defines 2-bit tags for each FPU data register, in MMX mode it
defines 1-bit tags for each data register. The single bit
tags are stored in the lower 8 bits and thus in the first byte
of the save frame.
See amd64/include/fpu.h and the IA-32 Software Developer's manual Vol 2A.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.12.1 src/sys/arch/i386/include/npx.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/include/npx.h
diff -u src/sys/arch/i386/include/npx.h:1.22 src/sys/arch/i386/include/npx.h:1.22.12.1
--- src/sys/arch/i386/include/npx.h:1.22 Tue May 2 19:03:24 2006
+++ src/sys/arch/i386/include/npx.h Sun Oct 18 15:17:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: npx.h,v 1.22 2006/05/02 19:03:24 drochner Exp $ */
+/* $NetBSD: npx.h,v 1.22.12.1 2009/10/18 15:17:30 bouyer Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,8 +81,8 @@
struct envxmm {
/*0*/ uint16_t en_cw; /* FPU Control Word */
uint16_t en_sw; /* FPU Status Word */
- uint8_t en_rsvd0;
uint8_t en_tw; /* FPU Tag Word (abridged) */
+ uint8_t en_rsvd0;
uint16_t en_opcode; /* FPU Opcode */
uint32_t en_fip; /* FPU Instruction Pointer */
uint16_t en_fcs; /* FPU IP selector */
CVS commit: [netbsd-4] src/sys/arch
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 15:20:43 UTC 2009
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-4]: machdep.c
src/sys/arch/i386/i386 [netbsd-4]: machdep.c
src/sys/arch/i386/isa [netbsd-4]: npx.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1363):
sys/arch/i386/isa/npx.c: revision 1.132 via patch
sys/arch/amd64/amd64/fpu.c: revision 1.29 via patch
sys/arch/amd64/amd64/machdep.c: revision 1.105 via patch
sys/arch/i386/i386/machdep.c: revision 1.647 via patch
PR port-i386/39299 FPU use in signal handlers is unsafe
Ensure FP state is reset, if FP is used in a signal handler.
Fixes PR kern/39299 for 32bit code.
To generate a diff of this commit:
cvs rdiff -u -r1.44.2.5 -r1.44.2.6 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.586.2.5 -r1.586.2.6 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.115 -r1.115.2.1 src/sys/arch/i386/isa/npx.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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.44.2.5 src/sys/arch/amd64/amd64/machdep.c:1.44.2.6
--- src/sys/arch/amd64/amd64/machdep.c:1.44.2.5 Sat Nov 22 16:33:41 2008
+++ src/sys/arch/amd64/amd64/machdep.c Sun Oct 18 15:20:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.44.2.5 2008/11/22 16:33:41 bouyer Exp $ */
+/* $NetBSD: machdep.c,v 1.44.2.6 2009/10/18 15:20:42 bouyer Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.44.2.5 2008/11/22 16:33:41 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.44.2.6 2009/10/18 15:20:42 bouyer Exp $);
#include opt_user_ldt.h
#include opt_ddb.h
@@ -518,6 +518,9 @@
buildcontext(l, catcher, fp);
+ /* Ensure FP state is reset, if FP is used. */
+ l-l_md.md_flags = ~MDP_USEDFPU;
+
tf-tf_rdi = sig;
tf-tf_rsi = (uint64_t)fp-sf_si;
tf-tf_rdx = tf-tf_r15 = (uint64_t)fp-sf_uc;
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.586.2.5 src/sys/arch/i386/i386/machdep.c:1.586.2.6
--- src/sys/arch/i386/i386/machdep.c:1.586.2.5 Tue Aug 28 11:46:26 2007
+++ src/sys/arch/i386/i386/machdep.c Sun Oct 18 15:20:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.586.2.5 2007/08/28 11:46:26 liamjfoy Exp $ */
+/* $NetBSD: machdep.c,v 1.586.2.6 2009/10/18 15:20:42 bouyer Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.586.2.5 2007/08/28 11:46:26 liamjfoy Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.586.2.6 2009/10/18 15:20:42 bouyer Exp $);
#include opt_beep.h
#include opt_compat_ibcs2.h
@@ -810,6 +810,12 @@
buildcontext(l, sel, catcher, fp);
+#if NNPX 0
+ /* make sure we get a clean FPU */
+ npxsave_lwp(l, 0);
+ l-l_md.md_flags = ~MDL_USEDFPU;
+#endif
+
/* Remember that we're now on the signal stack. */
if (onstack)
p-p_sigctx.ps_sigstk.ss_flags |= SS_ONSTACK;
Index: src/sys/arch/i386/isa/npx.c
diff -u src/sys/arch/i386/isa/npx.c:1.115 src/sys/arch/i386/isa/npx.c:1.115.2.1
--- src/sys/arch/i386/isa/npx.c:1.115 Thu Nov 16 01:32:38 2006
+++ src/sys/arch/i386/isa/npx.c Sun Oct 18 15:20:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: npx.c,v 1.115 2006/11/16 01:32:38 christos Exp $ */
+/* $NetBSD: npx.c,v 1.115.2.1 2009/10/18 15:20:42 bouyer Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npx.c,v 1.115 2006/11/16 01:32:38 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: npx.c,v 1.115.2.1 2009/10/18 15:20:42 bouyer Exp $);
#if 0
#define IPRINTF(x) printf x
@@ -565,7 +565,14 @@
splx(s);
if ((l-l_md.md_flags MDL_USEDFPU) == 0) {
- fldcw(l-l_addr-u_pcb.pcb_savefpu.sv_xmm.sv_env.en_cw);
+ fninit();
+ if (i386_use_fxsave) {
+ fldcw(l-l_addr-u_pcb.pcb_savefpu.
+ sv_xmm.sv_env.en_cw);
+ } else {
+ fldcw(l-l_addr-u_pcb.pcb_savefpu.
+ sv_87.sv_env.en_cw);
+ }
l-l_md.md_flags |= MDL_USEDFPU;
} else {
/*
CVS commit: [netbsd-4] src/sys/arch/amd64/amd64
Module Name:src Committed By: bouyer Date: Sun Oct 18 15:22:38 UTC 2009 Modified Files: src/sys/arch/amd64/amd64 [netbsd-4]: netbsd32_machdep.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #1363): sys/arch/i386/isa/npx.c: revision 1.132 via patch sys/arch/amd64/amd64/fpu.c: revision 1.29 via patch sys/arch/amd64/amd64/netbsd32_machdep.c: revision 1.59 via patch sys/arch/amd64/amd64/machdep.c: revision 1.105 via patch sys/arch/i386/i386/machdep.c: revision 1.647 via patch PR port-i386/39299 FPU use in signal handlers is unsafe Ensure FP state is reset, if FP is used in a signal handler. Fixes PR kern/39299 for 32bit code. To generate a diff of this commit: cvs rdiff -u -r1.30.2.2 -r1.30.2.3 \ src/sys/arch/amd64/amd64/netbsd32_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.30.2.2 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.30.2.3 --- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.30.2.2 Tue Nov 18 22:33:28 2008 +++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Sun Oct 18 15:22:38 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep.c,v 1.30.2.2 2008/11/18 22:33:28 bouyer Exp $ */ +/* $NetBSD: netbsd32_machdep.c,v 1.30.2.3 2009/10/18 15:22:38 bouyer Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_machdep.c,v 1.30.2.2 2008/11/18 22:33:28 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_machdep.c,v 1.30.2.3 2009/10/18 15:22:38 bouyer Exp $); #include opt_compat_netbsd.h #include opt_coredump.h @@ -266,6 +266,9 @@ struct lwp *l = curlwp; struct proc *p = l-l_proc; struct sigacts *ps = p-p_sigacts; + /* Ensure FP state is reset, if FP is used. */ + l-l_md.md_flags = ~MDP_USEDFPU; + int onstack; int sig = ksi-ksi_signo; struct netbsd32_sigframe_siginfo *fp, frame; @@ -335,6 +338,9 @@ tf-tf_rsp = (u_int64_t)fp; tf-tf_ss = GSEL(GUDATA32_SEL, SEL_UPL); + /* Ensure FP state is reset, if FP is used. */ + l-l_md.md_flags = ~MDP_USEDFPU; + /* Remember that we're now on the signal stack. */ if (onstack) p-p_sigctx.ps_sigstk.ss_flags |= SS_ONSTACK;
CVS commit: src/usr.sbin/sup/source
Module Name:src
Committed By: christos
Date: Sun Oct 18 15:23:54 UTC 2009
Modified Files:
src/usr.sbin/sup/source: ffilecopy.c scmio.c
Log Message:
fix size_t issues on _LP64
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sup/source/ffilecopy.c
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sup/source/scmio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sup/source/ffilecopy.c
diff -u src/usr.sbin/sup/source/ffilecopy.c:1.10 src/usr.sbin/sup/source/ffilecopy.c:1.11
--- src/usr.sbin/sup/source/ffilecopy.c:1.10 Sat Oct 17 18:26:13 2009
+++ src/usr.sbin/sup/source/ffilecopy.c Sun Oct 18 11:23:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ffilecopy.c,v 1.10 2009/10/17 22:26:13 christos Exp $ */
+/* $NetBSD: ffilecopy.c,v 1.11 2009/10/18 15:23:54 christos Exp $ */
/*
* Copyright (c) 1991 Carnegie Mellon University
@@ -96,7 +96,7 @@
*
*/
-int
+ssize_t
ffilecopy(FILE * here, FILE * there)
{
int i, herefile, therefile;
Index: src/usr.sbin/sup/source/scmio.c
diff -u src/usr.sbin/sup/source/scmio.c:1.18 src/usr.sbin/sup/source/scmio.c:1.19
--- src/usr.sbin/sup/source/scmio.c:1.18 Sat Oct 17 18:26:13 2009
+++ src/usr.sbin/sup/source/scmio.c Sun Oct 18 11:23:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: scmio.c,v 1.18 2009/10/17 22:26:13 christos Exp $ */
+/* $NetBSD: scmio.c,v 1.19 2009/10/18 15:23:54 christos Exp $ */
/*
* Copyright (c) 1992 Carnegie Mellon University
@@ -256,7 +256,8 @@
return (scmerr(-1, Write retries failed));
}
if (x != count)
- return (scmerr(-1, Write error on network returned %d on write of %d, x, count));
+ return (scmerr(-1, Write error on network returned %d
+ on write of %zu, x, count));
return (SCMOK);
}
@@ -434,7 +435,7 @@
if (push) {
if (bufptr + count buffer)
- return (scmerr(-1, No space in buffer %d, count));
+ return (scmerr(-1, No space in buffer %zu, count));
bufptr -= count;
bufcnt += count;
memcpy(bufptr, data, -count);
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 18 15:24:41 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: tickets 1362, 1363 To generate a diff of this commit: cvs rdiff -u -r1.1.2.179 -r1.1.2.180 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.179 src/doc/CHANGES-4.1:1.1.2.180 --- src/doc/CHANGES-4.1:1.1.2.179 Sun Oct 18 13:02:42 2009 +++ src/doc/CHANGES-4.1 Sun Oct 18 15:24:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.179 2009/10/18 13:02:42 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.180 2009/10/18 15:24:41 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3818,3 +3818,19 @@ Fixes PR bin/42143 [spz, ticket #1361] +sys/arch/i386/include/npx.h 1.23 + + Fix wrong memory layout of the FPU save frame. The debugger against a + ptrace'd process would be confused. + [mlelstv, ticket #1362] + +sys/arch/amd64/amd64/fpu.c 1.29 via patch +sys/arch/amd64/amd64/machdep.c 1.105 via patch +sys/arch/amd64/amd64/netbsd32_machdep.c 1.59 via patch +sys/arch/i386/i386/machdep.c 1.647 via patch +sys/arch/i386/isa/npx.c1.132 via patch + + PR port-i386/39299 FPU use in signal handlers is unsafe + Ensure FP state is reset, if FP is used in a signal handler. + [mlelstv, ticket #1363] +
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 18 15:46:03 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket 1364 To generate a diff of this commit: cvs rdiff -u -r1.1.2.180 -r1.1.2.181 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.180 src/doc/CHANGES-4.1:1.1.2.181 --- src/doc/CHANGES-4.1:1.1.2.180 Sun Oct 18 15:24:41 2009 +++ src/doc/CHANGES-4.1 Sun Oct 18 15:46:03 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.180 2009/10/18 15:24:41 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.181 2009/10/18 15:46:03 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3834,3 +3834,61 @@ Ensure FP state is reset, if FP is used in a signal handler. [mlelstv, ticket #1363] +external/bsd/pkg_install/dist/add/add.h 1.1.1.3 - 1.1.1.5 +external/bsd/pkg_install/dist/add/main.c 1.1.1.4 - 1.1.1.6 +external/bsd/pkg_install/dist/add/perform.c 1.1.1.10 - 1.1.1.12 +external/bsd/pkg_install/dist/add/pkg_add.1 1.1.1.8 +external/bsd/pkg_install/dist/admin/audit.c 1.1.1.6 +external/bsd/pkg_install/dist/admin/main.c 1.1.1.8 - 1.1.1.11 +external/bsd/pkg_install/dist/admin/pkg_admin.1 1.1.1.9 +external/bsd/pkg_install/dist/create/build.c 1.1.1.6 +external/bsd/pkg_install/dist/create/create.h 1.1.1.4 +external/bsd/pkg_install/dist/create/main.c 1.1.1.5 +external/bsd/pkg_install/dist/create/perform.c 1.1.1.4 +external/bsd/pkg_install/dist/delete/pkg_delete.1 1.1.1.5 - 1.1.1.6 +external/bsd/pkg_install/dist/delete/pkg_delete.c 1.1.1.5 +external/bsd/pkg_install/dist/info/info.h 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/info/main.c 1.1.1.6 - 1.1.1.7 +external/bsd/pkg_install/dist/info/perform.c 1.1.1.11 +external/bsd/pkg_install/dist/info/show.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/config.h.in 1.1.1.4 +external/bsd/pkg_install/dist/lib/conflicts.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/decompress.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/fexec.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/file.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/gpgsig.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/iterate.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/lib.h 1.1.1.8 - 1.1.1.9 +external/bsd/pkg_install/dist/lib/license.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/parse-config.c 1.1.1.5 - 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkcs7.c 1.1.1.4 +external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in 1.1.1.6 - 1.1.1.8 +external/bsd/pkg_install/dist/lib/pkg_io.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkg_signature.c 1.1.1.6 +external/bsd/pkg_install/dist/lib/pkgdb.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/plist.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/remove.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/var.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/version.h 1.1.1.18 - 1.1.1.21 + + Update to pkg_install-20091008: + - pkg_add: add support to check license conditions before installation + - pkg_delete: add -k option to skip over preserve packages. + - WARNS=4 clean, fix some potential uses of uninitialized variables + - Add a new command for pkg_admin: findbest. It takes one or more + patterns and searches for the best match in PKG_PATH, just like + pkg_add would. + It prints the URLs of the best match for each pattern to stdout. + - Rewrite the config file parser to read the file only once. + - Fix a bug in pkg_add's -P handling. For dependencies the pkgdb path + was computed incorrectly and included destdir more than once. + - Fix the ACTIVE_FTP option to actually set the a flag and not the + old p flag. + - restore pkg_add -f functionality for missing dependencies (PR 42001) + - pkg_admin rebuild should count packages correctly (he@), also + count @pkgdir + - fix gpg-sign-package syntax in pkg_admin(1) + - change default URL for pkg-vulnerabilities to use HTTP + - Fix German accent + - Don't dereference a null pointer for pkg_admin add + [joerg, ticket #1364]
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 18 15:49:45 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1364 To generate a diff of this commit: cvs rdiff -u -r1.1.2.59 -r1.1.2.60 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.59 src/doc/CHANGES-4.0.2:1.1.2.60 --- src/doc/CHANGES-4.0.2:1.1.2.59 Sat Oct 10 08:07:23 2009 +++ src/doc/CHANGES-4.0.2 Sun Oct 18 15:49:45 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.59 2009/10/10 08:07:23 sborrill Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.60 2009/10/18 15:49:45 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -881,3 +881,62 @@ Only generate SHA512 and MD5 checksums for releases. [snj, ticket #1365] +external/bsd/pkg_install/dist/add/add.h 1.1.1.3 - 1.1.1.5 +external/bsd/pkg_install/dist/add/main.c 1.1.1.4 - 1.1.1.6 +external/bsd/pkg_install/dist/add/perform.c 1.1.1.10 - 1.1.1.12 +external/bsd/pkg_install/dist/add/pkg_add.1 1.1.1.8 +external/bsd/pkg_install/dist/admin/audit.c 1.1.1.6 +external/bsd/pkg_install/dist/admin/main.c 1.1.1.8 - 1.1.1.11 +external/bsd/pkg_install/dist/admin/pkg_admin.1 1.1.1.9 +external/bsd/pkg_install/dist/create/build.c 1.1.1.6 +external/bsd/pkg_install/dist/create/create.h 1.1.1.4 +external/bsd/pkg_install/dist/create/main.c 1.1.1.5 +external/bsd/pkg_install/dist/create/perform.c 1.1.1.4 +external/bsd/pkg_install/dist/delete/pkg_delete.1 1.1.1.5 - 1.1.1.6 +external/bsd/pkg_install/dist/delete/pkg_delete.c 1.1.1.5 +external/bsd/pkg_install/dist/info/info.h 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/info/main.c 1.1.1.6 - 1.1.1.7 +external/bsd/pkg_install/dist/info/perform.c 1.1.1.11 +external/bsd/pkg_install/dist/info/show.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/config.h.in 1.1.1.4 +external/bsd/pkg_install/dist/lib/conflicts.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/decompress.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/fexec.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/file.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/gpgsig.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/iterate.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/lib.h 1.1.1.8 - 1.1.1.9 +external/bsd/pkg_install/dist/lib/license.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/parse-config.c 1.1.1.5 - 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkcs7.c 1.1.1.4 +external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in 1.1.1.6 - 1.1.1.8 +external/bsd/pkg_install/dist/lib/pkg_io.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkg_signature.c 1.1.1.6 +external/bsd/pkg_install/dist/lib/pkgdb.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/plist.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/remove.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/var.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/version.h 1.1.1.18 - 1.1.1.21 + + Update to pkg_install-20091008: + - pkg_add: add support to check license conditions before installation + - pkg_delete: add -k option to skip over preserve packages. + - WARNS=4 clean, fix some potential uses of uninitialized variables + - Add a new command for pkg_admin: findbest. It takes one or more + patterns and searches for the best match in PKG_PATH, just like + pkg_add would. + It prints the URLs of the best match for each pattern to stdout. + - Rewrite the config file parser to read the file only once. + - Fix a bug in pkg_add's -P handling. For dependencies the pkgdb path + was computed incorrectly and included destdir more than once. + - Fix the ACTIVE_FTP option to actually set the a flag and not the + old p flag. + - restore pkg_add -f functionality for missing dependencies (PR 42001) + - pkg_admin rebuild should count packages correctly (he@), also + count @pkgdir + - fix gpg-sign-package syntax in pkg_admin(1) + - change default URL for pkg-vulnerabilities to use HTTP + - Fix German accent + - Don't dereference a null pointer for pkg_admin add + [joerg, ticket #1364] +
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 18 15:50:11 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Fix formatting To generate a diff of this commit: cvs rdiff -u -r1.1.2.181 -r1.1.2.182 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.181 src/doc/CHANGES-4.1:1.1.2.182 --- src/doc/CHANGES-4.1:1.1.2.181 Sun Oct 18 15:46:03 2009 +++ src/doc/CHANGES-4.1 Sun Oct 18 15:50:11 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.181 2009/10/18 15:46:03 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.182 2009/10/18 15:50:11 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3892,3 +3892,4 @@ - Fix German accent - Don't dereference a null pointer for pkg_admin add [joerg, ticket #1364] +
CVS commit: src/usr.sbin/puffs/rump_nfs
Module Name:src Committed By: pooka Date: Sun Oct 18 15:57:15 UTC 2009 Modified Files: src/usr.sbin/puffs/rump_nfs: rump_nfs.c Log Message: Use write through cache here too. Doesn't make the same kind of difference as with smbfs since nfs is stateless, but better to have the data on the server ASAP in case some other nods wants to use it. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/puffs/rump_nfs/rump_nfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/rump_nfs/rump_nfs.c diff -u src/usr.sbin/puffs/rump_nfs/rump_nfs.c:1.7 src/usr.sbin/puffs/rump_nfs/rump_nfs.c:1.8 --- src/usr.sbin/puffs/rump_nfs/rump_nfs.c:1.7 Sun Jan 11 20:31:03 2009 +++ src/usr.sbin/puffs/rump_nfs/rump_nfs.c Sun Oct 18 15:57:15 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_nfs.c,v 1.7 2009/01/11 20:31:03 pooka Exp $ */ +/* $NetBSD: rump_nfs.c,v 1.8 2009/10/18 15:57:15 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -65,7 +65,7 @@ mount_nfs_parseargs(argc, argv, args, mntflags, canon_dev, canon_dir); rv = p2k_run_fs(MOUNT_NFS, canon_dev, canon_dir, mntflags, args, - sizeof(args), 0); + sizeof(args), PUFFS_KFLAG_WTCACHE); if (rv == -1) err(1, mount);
CVS commit: src/usr.sbin/puffs/rump_nfs
Module Name:src Committed By: pooka Date: Sun Oct 18 16:02:15 UTC 2009 Modified Files: src/usr.sbin/puffs/rump_nfs: rump_nfs.c Log Message: Remove threading ifdefs. It was never easy to run the nfs client without threads, but now it's even more difficult due to sillyrename using workqueue, so whoever wants to do it will have to take to manual fiddling. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/rump_nfs/rump_nfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/rump_nfs/rump_nfs.c diff -u src/usr.sbin/puffs/rump_nfs/rump_nfs.c:1.8 src/usr.sbin/puffs/rump_nfs/rump_nfs.c:1.9 --- src/usr.sbin/puffs/rump_nfs/rump_nfs.c:1.8 Sun Oct 18 15:57:15 2009 +++ src/usr.sbin/puffs/rump_nfs/rump_nfs.c Sun Oct 18 16:02:15 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_nfs.c,v 1.8 2009/10/18 15:57:15 pooka Exp $ */ +/* $NetBSD: rump_nfs.c,v 1.9 2009/10/18 16:02:15 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -47,20 +47,6 @@ char canon_dev[MAXPATHLEN], canon_dir[MAXPATHLEN]; int rv, mntflags; -#if 0 - extern int rumpns_nfs_niothreads; /* XXX */ - char *thr; - /* - * XXX: but we can't call rump init before we detach (fork()) in - * p2k_run_fs() lest we lose our threads. - */ - thr = getenv(RUMP_THREADS); - if (!thr || !*thr) - rumpns_nfs_niothreads = 0; -#else - setenv(RUMP_THREADS, 1, 1); -#endif - setprogname(argv[0]); mount_nfs_parseargs(argc, argv, args, mntflags, canon_dev, canon_dir);
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 18 16:03:45 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1075 To generate a diff of this commit: cvs rdiff -u -r1.1.2.118 -r1.1.2.119 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.118 src/doc/CHANGES-5.1:1.1.2.119 --- src/doc/CHANGES-5.1:1.1.2.118 Sun Oct 18 12:46:42 2009 +++ src/doc/CHANGES-5.1 Sun Oct 18 16:03:45 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.118 2009/10/18 12:46:42 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.119 2009/10/18 16:03:45 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14361,3 +14361,62 @@ Support VOP_ABORTOP() in puffs. [pooka, ticket #1100] +external/bsd/pkg_install/dist/add/add.h 1.1.1.3 - 1.1.1.5 +external/bsd/pkg_install/dist/add/main.c 1.1.1.4 - 1.1.1.6 +external/bsd/pkg_install/dist/add/perform.c 1.1.1.10 - 1.1.1.12 +external/bsd/pkg_install/dist/add/pkg_add.1 1.1.1.8 +external/bsd/pkg_install/dist/admin/audit.c 1.1.1.6 +external/bsd/pkg_install/dist/admin/main.c 1.1.1.8 - 1.1.1.11 +external/bsd/pkg_install/dist/admin/pkg_admin.1 1.1.1.9 +external/bsd/pkg_install/dist/create/build.c 1.1.1.6 +external/bsd/pkg_install/dist/create/create.h 1.1.1.4 +external/bsd/pkg_install/dist/create/main.c 1.1.1.5 +external/bsd/pkg_install/dist/create/perform.c 1.1.1.4 +external/bsd/pkg_install/dist/delete/pkg_delete.1 1.1.1.5 - 1.1.1.6 +external/bsd/pkg_install/dist/delete/pkg_delete.c 1.1.1.5 +external/bsd/pkg_install/dist/info/info.h 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/info/main.c 1.1.1.6 - 1.1.1.7 +external/bsd/pkg_install/dist/info/perform.c 1.1.1.11 +external/bsd/pkg_install/dist/info/show.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/config.h.in 1.1.1.4 +external/bsd/pkg_install/dist/lib/conflicts.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/decompress.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/fexec.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/file.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/gpgsig.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/iterate.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/lib.h 1.1.1.8 - 1.1.1.9 +external/bsd/pkg_install/dist/lib/license.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/parse-config.c 1.1.1.5 - 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkcs7.c 1.1.1.4 +external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in 1.1.1.6 - 1.1.1.8 +external/bsd/pkg_install/dist/lib/pkg_io.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkg_signature.c 1.1.1.6 +external/bsd/pkg_install/dist/lib/pkgdb.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/plist.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/remove.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/var.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/version.h 1.1.1.18 - 1.1.1.21 + + Update to pkg_install-20091008: + - pkg_add: add support to check license conditions before installation + - pkg_delete: add -k option to skip over preserve packages. + - WARNS=4 clean, fix some potential uses of uninitialized variables + - Add a new command for pkg_admin: findbest. It takes one or more + patterns and searches for the best match in PKG_PATH, just like + pkg_add would. + It prints the URLs of the best match for each pattern to stdout. + - Rewrite the config file parser to read the file only once. + - Fix a bug in pkg_add's -P handling. For dependencies the pkgdb path + was computed incorrectly and included destdir more than once. + - Fix the ACTIVE_FTP option to actually set the a flag and not the + old p flag. + - restore pkg_add -f functionality for missing dependencies (PR 42001) + - pkg_admin rebuild should count packages correctly (he@), also + count @pkgdir + - fix gpg-sign-package syntax in pkg_admin(1) + - change default URL for pkg-vulnerabilities to use HTTP + - Fix German accent + - Don't dereference a null pointer for pkg_admin add + [joerg, ticket #1075] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 18 16:06:21 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1075 To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 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.20 src/doc/CHANGES-5.0.2:1.1.2.21 --- src/doc/CHANGES-5.0.2:1.1.2.20 Fri Oct 16 06:48:50 2009 +++ src/doc/CHANGES-5.0.2 Sun Oct 18 16:06:21 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.20 2009/10/16 06:48:50 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.21 2009/10/18 16:06:21 bouyer Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -338,3 +338,62 @@ mucking with the shootdown queue. [mhitch, ticket #1073] +external/bsd/pkg_install/dist/add/add.h 1.1.1.3 - 1.1.1.5 +external/bsd/pkg_install/dist/add/main.c 1.1.1.4 - 1.1.1.6 +external/bsd/pkg_install/dist/add/perform.c 1.1.1.10 - 1.1.1.12 +external/bsd/pkg_install/dist/add/pkg_add.1 1.1.1.8 +external/bsd/pkg_install/dist/admin/audit.c 1.1.1.6 +external/bsd/pkg_install/dist/admin/main.c 1.1.1.8 - 1.1.1.11 +external/bsd/pkg_install/dist/admin/pkg_admin.1 1.1.1.9 +external/bsd/pkg_install/dist/create/build.c 1.1.1.6 +external/bsd/pkg_install/dist/create/create.h 1.1.1.4 +external/bsd/pkg_install/dist/create/main.c 1.1.1.5 +external/bsd/pkg_install/dist/create/perform.c 1.1.1.4 +external/bsd/pkg_install/dist/delete/pkg_delete.1 1.1.1.5 - 1.1.1.6 +external/bsd/pkg_install/dist/delete/pkg_delete.c 1.1.1.5 +external/bsd/pkg_install/dist/info/info.h 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/info/main.c 1.1.1.6 - 1.1.1.7 +external/bsd/pkg_install/dist/info/perform.c 1.1.1.11 +external/bsd/pkg_install/dist/info/show.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/config.h.in 1.1.1.4 +external/bsd/pkg_install/dist/lib/conflicts.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/decompress.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/fexec.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/file.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/gpgsig.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/iterate.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/lib.h 1.1.1.8 - 1.1.1.9 +external/bsd/pkg_install/dist/lib/license.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/parse-config.c 1.1.1.5 - 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkcs7.c 1.1.1.4 +external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in 1.1.1.6 - 1.1.1.8 +external/bsd/pkg_install/dist/lib/pkg_io.c 1.1.1.7 +external/bsd/pkg_install/dist/lib/pkg_signature.c 1.1.1.6 +external/bsd/pkg_install/dist/lib/pkgdb.c 1.1.1.4 - 1.1.1.5 +external/bsd/pkg_install/dist/lib/plist.c 1.1.1.5 +external/bsd/pkg_install/dist/lib/remove.c 1.1.1.2 +external/bsd/pkg_install/dist/lib/var.c 1.1.1.3 +external/bsd/pkg_install/dist/lib/version.h 1.1.1.18 - 1.1.1.21 + + Update to pkg_install-20091008: + - pkg_add: add support to check license conditions before installation + - pkg_delete: add -k option to skip over preserve packages. + - WARNS=4 clean, fix some potential uses of uninitialized variables + - Add a new command for pkg_admin: findbest. It takes one or more + patterns and searches for the best match in PKG_PATH, just like + pkg_add would. + It prints the URLs of the best match for each pattern to stdout. + - Rewrite the config file parser to read the file only once. + - Fix a bug in pkg_add's -P handling. For dependencies the pkgdb path + was computed incorrectly and included destdir more than once. + - Fix the ACTIVE_FTP option to actually set the a flag and not the + old p flag. + - restore pkg_add -f functionality for missing dependencies (PR 42001) + - pkg_admin rebuild should count packages correctly (he@), also + count @pkgdir + - fix gpg-sign-package syntax in pkg_admin(1) + - change default URL for pkg-vulnerabilities to use HTTP + - Fix German accent + - Don't dereference a null pointer for pkg_admin add + [joerg, ticket #1075] +
CVS commit: [netbsd-5] src/sys/dev/ic
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 16:39:13 UTC 2009
Modified Files:
src/sys/dev/ic [netbsd-5]: wdc.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1074):
sys/dev/ic/wdc.c: revision 1.258
Commit patch from PR#41926. Confirmed to work by PR submitter on two
controllers as well myself and another on viaide.
Stops errors such as the following when probing SATA drives through
controllers that offer the legacy pciide interface:
viaide1 channel 0: reset failed for drive 0
OK bouyer@
To generate a diff of this commit:
cvs rdiff -u -r1.255.4.1 -r1.255.4.2 src/sys/dev/ic/wdc.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/wdc.c
diff -u src/sys/dev/ic/wdc.c:1.255.4.1 src/sys/dev/ic/wdc.c:1.255.4.2
--- src/sys/dev/ic/wdc.c:1.255.4.1 Thu Nov 20 02:45:36 2008
+++ src/sys/dev/ic/wdc.c Sun Oct 18 16:39:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.255.4.1 2008/11/20 02:45:36 snj Exp $ */
+/* $NetBSD: wdc.c,v 1.255.4.2 2009/10/18 16:39:13 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@@ -63,7 +63,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wdc.c,v 1.255.4.1 2008/11/20 02:45:36 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: wdc.c,v 1.255.4.2 2009/10/18 16:39:13 bouyer Exp $);
#include opt_ata.h
@@ -209,7 +209,7 @@
wdc_sataprobe(struct ata_channel *chp)
{
struct wdc_regs *wdr = CHAN_TO_WDC_REGS(chp);
- uint16_t scnt, sn, cl, ch;
+ uint8_t st = 0, sc, sn, cl, ch;
int i, s;
/* XXX This should be done by other code. */
@@ -222,23 +222,34 @@
switch (sata_reset_interface(chp, wdr-sata_iot, wdr-sata_control,
wdr-sata_status)) {
case SStatus_DET_DEV:
- bus_space_write_1(wdr-cmd_iot, wdr-cmd_iohs[wd_sdh], 0,
- WDSD_IBM);
- delay(10); /* 400ns delay */
- scnt = bus_space_read_2(wdr-cmd_iot,
+ /* wait 5s for BSY to clear */
+ for (i = 0; i WDC_PROBE_WAIT * hz; i++) {
+ bus_space_write_1(wdr-cmd_iot,
+ wdr-cmd_iohs[wd_sdh], 0, WDSD_IBM);
+ delay(10); /* 400ns delay */
+ st = bus_space_read_1(wdr-cmd_iot,
+ wdr-cmd_iohs[wd_status], 0);
+ if ((st WDCS_BSY) == 0)
+break;
+ tsleep(chp, PRIBIO, sataprb, 1);
+ }
+ if (i == WDC_PROBE_WAIT * hz)
+ aprint_error_dev(chp-ch_atac-atac_dev,
+ BSY never cleared, status 0x%02x\n, st);
+ sc = bus_space_read_1(wdr-cmd_iot,
wdr-cmd_iohs[wd_seccnt], 0);
- sn = bus_space_read_2(wdr-cmd_iot,
+ sn = bus_space_read_1(wdr-cmd_iot,
wdr-cmd_iohs[wd_sector], 0);
- cl = bus_space_read_2(wdr-cmd_iot,
+ cl = bus_space_read_1(wdr-cmd_iot,
wdr-cmd_iohs[wd_cyl_lo], 0);
- ch = bus_space_read_2(wdr-cmd_iot,
+ ch = bus_space_read_1(wdr-cmd_iot,
wdr-cmd_iohs[wd_cyl_hi], 0);
- ATADEBUG_PRINT((%s: port %d: scnt=0x%x sn=0x%x
+ ATADEBUG_PRINT((%s: port %d: sc=0x%x sn=0x%x
cl=0x%x ch=0x%x\n,
device_xname(chp-ch_atac-atac_dev), chp-ch_channel,
- scnt, sn, cl, ch), DEBUG_PROBE);
+ sc, sn, cl, ch), DEBUG_PROBE);
/*
- * scnt and sn are supposed to be 0x1 for ATAPI, but in some
+ * sc and sn are supposed to be 0x1 for ATAPI, but in some
* cases we get wrong values here, so ignore it.
*/
s = splbio();
CVS commit: [netbsd-5] src/sys/arch/i386/stand/boot
Module Name:src
Committed By: bouyer
Date: Sun Oct 18 16:41:28 UTC 2009
Modified Files:
src/sys/arch/i386/stand/boot [netbsd-5]: boot2.c
Log Message:
Apply patch, requested by snj in ticket 1080:
sys/arch/i386/stand/boot/boot2.c: patch
- If the menuformat is not letter, do not allow letter keys to be
aliases for number keys.
- Don't treat timeouts or the return key as an invalid choice.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/arch/i386/stand/boot/boot2.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/i386/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.38 src/sys/arch/i386/stand/boot/boot2.c:1.38.4.1
--- src/sys/arch/i386/stand/boot/boot2.c:1.38 Sat Oct 11 11:06:19 2008
+++ src/sys/arch/i386/stand/boot/boot2.c Sun Oct 18 16:41:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.38 2008/10/11 11:06:19 joerg Exp $ */
+/* $NetBSD: boot2.c,v 1.38.4.1 2009/10/18 16:41:28 bouyer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -482,11 +482,15 @@
static int getchoicefrominput(char *input, int def)
{
- int choice;
+ int choice, usedef;
+
choice = -1;
- if (*input == '\0' || *input == '\r' || *input == '\n')
+ usedef = 0;
+
+ if (*input == '\0' || *input == '\r' || *input == '\n') {
choice = def;
- else if (*input = 'A' *input bootconf.nummenu + 'A')
+ usedef = 1;
+ } else if (*input = 'A' *input bootconf.nummenu + 'A')
choice = (*input) - 'A';
else if (*input = 'a' *input bootconf.nummenu + 'a')
choice = (*input) - 'a';
@@ -495,6 +499,11 @@
if (choice 0 || choice = bootconf.nummenu)
choice = -1;
}
+
+ if (bootconf.menuformat != MENUFORMAT_LETTER
+ !isnum(*input) !usedef)
+ choice = -1;
+
return choice;
}
CVS commit: [netbsd-5] src
Module Name:src Committed By: bouyer Date: Sun Oct 18 16:50:14 UTC 2009 Modified Files: src/distrib/sets/lists/base [netbsd-5]: mi src/distrib/sets/lists/man [netbsd-5]: mi src/sys/dev/pci/hdaudio [netbsd-5]: hdaudio.c hdaudio_afg.c hdaudioio.h hdaudiovar.h src/usr.sbin [netbsd-5]: Makefile Added Files: src/usr.sbin/hdaudioctl [netbsd-5]: Makefile graph.c hdaudioctl.8 hdaudioctl.c hdaudioctl.h Log Message: Pull up following revision(s) (requested by sborrill in ticket #1086): usr.sbin/hdaudioctl/Makefile: revision 1.1 via patch usr.sbin/hdaudioctl/graph.c: revision 1.1 sys/dev/pci/hdaudio/hdaudio.c: revision 1.5 distrib/sets/lists/base/mi: revision 1.833 sys/dev/pci/hdaudio/hdaudio_afg.c: revision 1.17 sys/dev/pci/hdaudio/hdaudiovar.h: revision 1.5 distrib/sets/lists/man/mi: revision 1.1164 sys/dev/pci/hdaudio/hdaudioio.h: revision 1.3 usr.sbin/hdaudioctl/hdaudioctl.c: revision 1.1 usr.sbin/hdaudioctl/hdaudioctl.h: revision 1.1 usr.sbin/hdaudioctl/hdaudioctl.8: revision 1.1, 1.2 usr.sbin/Makefile: revision 1.243 Add ioctls required by hdaudioctl. This involves some refactoring of the hdaudio_afg ioctl code. Add hdaudioctl(8), a tool to manipulate hdaudio(4) devices. It offer the following subcommands: list - shows all child codec get - get a plist of the chosen codec's widget configuration set - forcibly reconfigure a specified codec from a plist graph - generate a graphviz file for the specified codec Sort sections, fix SEE ALSO. End sentence with dot. To generate a diff of this commit: cvs rdiff -u -r1.780.2.14 -r1.780.2.15 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1109.2.11 -r1.1109.2.12 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/sys/dev/pci/hdaudio/hdaudio.c \ src/sys/dev/pci/hdaudio/hdaudiovar.h cvs rdiff -u -r1.14.2.4 -r1.14.2.5 src/sys/dev/pci/hdaudio/hdaudio_afg.c cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/sys/dev/pci/hdaudio/hdaudioio.h cvs rdiff -u -r1.237.4.1 -r1.237.4.2 src/usr.sbin/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/usr.sbin/hdaudioctl/Makefile \ src/usr.sbin/hdaudioctl/graph.c src/usr.sbin/hdaudioctl/hdaudioctl.c \ src/usr.sbin/hdaudioctl/hdaudioctl.h cvs rdiff -u -r0 -r1.2.2.2 src/usr.sbin/hdaudioctl/hdaudioctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.780.2.14 src/distrib/sets/lists/base/mi:1.780.2.15 --- src/distrib/sets/lists/base/mi:1.780.2.14 Wed Oct 14 18:10:21 2009 +++ src/distrib/sets/lists/base/mi Sun Oct 18 16:50:13 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.14 2009/10/14 18:10:21 snj Exp $ +# $NetBSD: mi,v 1.780.2.15 2009/10/18 16:50:13 bouyer Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -1382,6 +1382,7 @@ ./usr/sbin/groupdelbase-sysutil-bin ./usr/sbin/groupinfobase-sysutil-bin ./usr/sbin/groupmodbase-sysutil-bin +./usr/sbin/hdaudioctlbase-sysutil-bin ./usr/sbin/hlfsdbase-amd-bin ./usr/sbin/host base-obsolete obsolete ./usr/sbin/hostapdbase-sysutil-bin Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1109.2.11 src/distrib/sets/lists/man/mi:1.1109.2.12 --- src/distrib/sets/lists/man/mi:1.1109.2.11 Fri Oct 16 11:56:10 2009 +++ src/distrib/sets/lists/man/mi Sun Oct 18 16:50:13 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1109.2.11 2009/10/16 11:56:10 sborrill Exp $ +# $NetBSD: mi,v 1.1109.2.12 2009/10/18 16:50:13 bouyer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2088,6 +2088,7 @@ ./usr/share/man/cat8/groupmod.0 man-sysutil-catman .cat ./usr/share/man/cat8/gspa.0 man-sysutil-catman .cat ./usr/share/man/cat8/halt.0 man-sysutil-catman .cat +./usr/share/man/cat8/hdaudioctl.0 man-sysutil-catman .cat ./usr/share/man/cat8/hlfsd.0 man-amd-catman .cat ./usr/share/man/cat8/hostapd.0 man-sysutil-catman .cat ./usr/share/man/cat8/hostapd_cli.0 man-sysutil-catman .cat @@ -4471,6 +4472,7 @@ ./usr/share/man/html8/groupmod.html man-sysutil-htmlman html ./usr/share/man/html8/gspa.html man-sysutil-htmlman html ./usr/share/man/html8/halt.html man-sysutil-htmlman html +./usr/share/man/html8/hdaudioctl.html man-sysutil-htmlman html ./usr/share/man/html8/hlfsd.html man-amd-htmlman html ./usr/share/man/html8/hostapd.html man-sysutil-htmlman html ./usr/share/man/html8/hostapd_cli.html man-sysutil-htmlman html @@ -6951,6 +6953,7 @@ ./usr/share/man/man8/groupmod.8 man-sysutil-man .man ./usr/share/man/man8/gspa.8 man-sysutil-man .man ./usr/share/man/man8/halt.8 man-sysutil-man .man +./usr/share/man/man8/hdaudioctl.8 man-sysutil-man .man ./usr/share/man/man8/hlfsd.8
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sun Oct 18 17:07:31 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 1075, 1080, 1086 To generate a diff of this commit: cvs rdiff -u -r1.1.2.119 -r1.1.2.120 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.119 src/doc/CHANGES-5.1:1.1.2.120 --- src/doc/CHANGES-5.1:1.1.2.119 Sun Oct 18 16:03:45 2009 +++ src/doc/CHANGES-5.1 Sun Oct 18 17:07:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.119 2009/10/18 16:03:45 bouyer Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.120 2009/10/18 17:07:30 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14420,3 +14420,35 @@ - Don't dereference a null pointer for pkg_admin add [joerg, ticket #1075] +sys/dev/ic/wdc.c1.258 + + Commit patch from PR#41926: use 8bits access to legacy IDE registers + through the SATA interface (except data registers). + Stops errors such as the following when probing SATA drives through + controllers that offer the legacy pciide interface: + viaide1 channel 0: reset failed for drive 0 + [sborrill, ticket #1074] + +sys/arch/i386/stand/boot/boot2.c patch + + - If the menuformat is not letter, do not allow letter keys to be + aliases for number keys. + - Don't treat timeouts or the return key as an invalid choice. + [snj, ticket #1080] + +distrib/sets/lists/base/mi 1.833 +distrib/sets/lists/man/mi 1.1164 +sys/dev/pci/hdaudio/hdaudio.c 1.5 +sys/dev/pci/hdaudio/hdaudio_afg.c 1.17 +sys/dev/pci/hdaudio/hdaudioio.h 1.3 +sys/dev/pci/hdaudio/hdaudiovar.h 1.5 +usr.sbin/Makefile1.243 via patch +usr.sbin/hdaudioctl/Makefile 1.1 +usr.sbin/hdaudioctl/graph.c 1.1 +usr.sbin/hdaudioctl/hdaudioctl.8 1.1, 1.2 +usr.sbin/hdaudioctl/hdaudioctl.c 1.1 +usr.sbin/hdaudioctl/hdaudioctl.h 1.1 + + Add hdaudioctl(8), a tool to manipulate hdaudio(4) devices. + [sborrill, ticket #1086] +
CVS commit: src/external/apache2/mDNSResponder/usr.sbin/mdnsd
Module Name:src
Committed By: tron
Date: Sun Oct 18 17:43:11 UTC 2009
Modified Files:
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
Log Message:
Remove generated file mdnsd.8 in cleandir target.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/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/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
diff -u src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.4 src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.5
--- src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.4 Sat Oct 3 00:03:05 2009
+++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile Sun Oct 18 17:43:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/10/03 00:03:05 tsarna Exp $
+# $NetBSD: Makefile,v 1.5 2009/10/18 17:43:11 tron Exp $
PROG= mdnsd
@@ -18,5 +18,7 @@
mdnsd.8: mDNSResponder.8
${TOOL_CAT} $? $@
-
+
+CLEANFILES+= mdnsd.8
+
.include bsd.prog.mk
CVS commit: src
Module Name:src Committed By: snj Date: Sun Oct 18 18:14:00 UTC 2009 Modified Files: src/share/man/man5: genassym.cf.5 src/sys/arch/amd64/amd64: kgdb_machdep.c src/sys/arch/arm/arm32: kgdb_machdep.c src/sys/arch/i386/i386: kgdb_machdep.c src/sys/arch/mips/mips: kgdb_machdep.c src/sys/arch/sh3/sh3: kgdb_machdep.c src/sys/dev/podulebus: hcsc.c src/usr.bin/genassym: genassym.1 genassym.sh Log Message: Move Matthias Pfaller's files to 2-clause license. OK matth...@. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man5/genassym.cf.5 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/amd64/kgdb_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm32/kgdb_machdep.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/i386/kgdb_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/mips/kgdb_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sh3/sh3/kgdb_machdep.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/podulebus/hcsc.c cvs rdiff -u -r1.3 -r1.4 src/usr.bin/genassym/genassym.1 cvs rdiff -u -r1.4 -r1.5 src/usr.bin/genassym/genassym.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/genassym.cf.5 diff -u src/share/man/man5/genassym.cf.5:1.11 src/share/man/man5/genassym.cf.5:1.12 --- src/share/man/man5/genassym.cf.5:1.11 Sun Sep 11 23:32:48 2005 +++ src/share/man/man5/genassym.cf.5 Sun Oct 18 18:13:59 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: genassym.cf.5,v 1.11 2005/09/11 23:32:48 wiz Exp $ +.\ $NetBSD: genassym.cf.5,v 1.12 2009/10/18 18:13:59 snj Exp $ .\ .\ Copyright (c) 1997 Matthias Pfaller. .\ All rights reserved. @@ -11,11 +11,6 @@ .\ 2. Redistributions in binary form must reproduce the above copyright .\notice, this list of conditions and the following disclaimer in the .\documentation and/or other materials provided with the distribution. -.\ 3. All advertising materials mentioning features or use of this software -.\must display the following acknowledgement: -.\ This product includes software developed by Matthias Pfaller. -.\ 4. The name of the author may not be used to endorse or promote products -.\derived from this software without specific prior written permission .\ .\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR .\ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/arch/amd64/amd64/kgdb_machdep.c diff -u src/sys/arch/amd64/amd64/kgdb_machdep.c:1.5 src/sys/arch/amd64/amd64/kgdb_machdep.c:1.6 --- src/sys/arch/amd64/amd64/kgdb_machdep.c:1.5 Sat Mar 14 15:36:00 2009 +++ src/sys/arch/amd64/amd64/kgdb_machdep.c Sun Oct 18 18:13:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: kgdb_machdep.c,v 1.5 2009/03/14 15:36:00 dsl Exp $ */ +/* $NetBSD: kgdb_machdep.c,v 1.6 2009/10/18 18:13:59 snj Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -42,11 +42,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Matthias Pfaller. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -61,7 +56,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kgdb_machdep.c,v 1.5 2009/03/14 15:36:00 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: kgdb_machdep.c,v 1.6 2009/10/18 18:13:59 snj Exp $); #include opt_ddb.h Index: src/sys/arch/arm/arm32/kgdb_machdep.c diff -u src/sys/arch/arm/arm32/kgdb_machdep.c:1.6 src/sys/arch/arm/arm32/kgdb_machdep.c:1.7 --- src/sys/arch/arm/arm32/kgdb_machdep.c:1.6 Sat Mar 14 15:36:01 2009 +++ src/sys/arch/arm/arm32/kgdb_machdep.c Sun Oct 18 18:14:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: kgdb_machdep.c,v 1.6 2009/03/14 15:36:01 dsl Exp $ */ +/* $NetBSD: kgdb_machdep.c,v 1.7 2009/10/18 18:14:00 snj Exp $ */ /* * Copyright (c) 1996 Matthias Pfaller. @@ -12,11 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Matthias Pfaller. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Sun Oct 18 18:23:29 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: Prune Pfaller. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.56 src/distrib/notes/common/legal.common:1.57 --- src/distrib/notes/common/legal.common:1.56 Sun Oct 18 14:24:17 2009 +++ src/distrib/notes/common/legal.common Sun Oct 18 18:23:29 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.56 2009/10/18 14:24:17 snj Exp $ +.\ $NetBSD: legal.common,v 1.57 2009/10/18 18:23:29 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -373,8 +373,6 @@ .It This product includes software developed by Matthew Fredette. .It -This product includes software developed by Matthias Pfaller. -.It This product includes software developed by Michael Graff for the NetBSD Project. .It
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src Committed By: snj Date: Sun Oct 18 18:24:31 UTC 2009 Modified Files: src/sys/dev/pci [netbsd-5]: Makefile Added Files: src/sys/dev/pci/hdaudio [netbsd-5]: Makefile Log Message: Pull up following revision(s) (requested by sborrill in ticket #1101): sys/dev/pci/Makefile: revision 1.13 sys/dev/pci/hdaudio/Makefile: revision 1.1 Install hdaudio includes required by userland tools To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.70.1 src/sys/dev/pci/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/pci/hdaudio/Makefile 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/Makefile diff -u src/sys/dev/pci/Makefile:1.12 src/sys/dev/pci/Makefile:1.12.70.1 --- src/sys/dev/pci/Makefile:1.12 Sun Jul 23 12:01:26 2006 +++ src/sys/dev/pci/Makefile Sun Oct 18 18:24:31 2009 @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2006/07/23 12:01:26 bouyer Exp $ +# $NetBSD: Makefile,v 1.12.70.1 2009/10/18 18:24:31 snj Exp $ # use 'make -f Makefile.pcidevs' to make pcidevs.h and pcidevs_data.h +SUBDIR= hdaudio + INCSDIR= /usr/include/dev/pci # Only install includes which are used by userland Added files: Index: src/sys/dev/pci/hdaudio/Makefile diff -u /dev/null src/sys/dev/pci/hdaudio/Makefile:1.1.2.2 --- /dev/null Sun Oct 18 18:24:31 2009 +++ src/sys/dev/pci/hdaudio/Makefile Sun Oct 18 18:24:31 2009 @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1.2.2 2009/10/18 18:24:31 snj Exp $ + +INCSDIR= /usr/include/dev/pci/hdaudio + +# Only install includes which are used by userland +INCS= hdaudioio.h hdaudioreg.h + +.include bsd.kinc.mk
CVS commit: [netbsd-5] src/distrib/sets/lists/comp
Module Name:src Committed By: snj Date: Sun Oct 18 18:26:27 UTC 2009 Modified Files: src/distrib/sets/lists/comp [netbsd-5]: mi Log Message: Pull up following revision(s) (requested by sborrill in ticket #1101): distrib/sets/lists/comp/mi: revision 1.1312 Add hdaudio headers To generate a diff of this commit: cvs rdiff -u -r1.1201.2.12 -r1.1201.2.13 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.1201.2.12 src/distrib/sets/lists/comp/mi:1.1201.2.13 --- src/distrib/sets/lists/comp/mi:1.1201.2.12 Tue Sep 15 06:01:38 2009 +++ src/distrib/sets/lists/comp/mi Sun Oct 18 18:26:26 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1201.2.12 2009/09/15 06:01:38 snj Exp $ +# $NetBSD: mi,v 1.1201.2.13 2009/10/18 18:26:26 snj Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -462,6 +462,8 @@ ./usr/include/dev/ofw/openfirmio.h comp-c-include ./usr/include/dev/pci/amrio.h comp-c-include ./usr/include/dev/pci/amrreg.h comp-c-include +./usr/include/dev/pci/hdaudio/hdaudioio.h comp-c-include +./usr/include/dev/pci/hdaudio/hdaudioreg.h comp-c-include ./usr/include/dev/pci/if_devar.h comp-obsolete obsolete ./usr/include/dev/pci/if_fxpreg.h comp-obsolete obsolete ./usr/include/dev/pci/if_fxpvar.h comp-obsolete obsolete
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Sun Oct 18 18:28:58 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1101. To generate a diff of this commit: cvs rdiff -u -r1.1.2.120 -r1.1.2.121 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.120 src/doc/CHANGES-5.1:1.1.2.121 --- src/doc/CHANGES-5.1:1.1.2.120 Sun Oct 18 17:07:30 2009 +++ src/doc/CHANGES-5.1 Sun Oct 18 18:28:58 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.120 2009/10/18 17:07:30 bouyer Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.121 2009/10/18 18:28:58 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14452,3 +14452,10 @@ Add hdaudioctl(8), a tool to manipulate hdaudio(4) devices. [sborrill, ticket #1086] +distrib/sets/lists/comp/mi 1.1312 +sys/dev/pci/Makefile1.13 +sys/dev/pci/hdaudio/Makefile 1.1 + + Install hdaudio includes required by userland tools. + [sborrill, ticket #1101] +
CVS commit: [netbsd-5] src/distrib/sets/lists/base
Module Name:src Committed By: snj Date: Sun Oct 18 19:02:34 UTC 2009 Modified Files: src/distrib/sets/lists/base [netbsd-5]: mi Log Message: Pull up following revision(s) (requested by sborrill in ticket #1102): distrib/sets/lists/base/mi: revision 1.830 add hdaudio files. To generate a diff of this commit: cvs rdiff -u -r1.780.2.15 -r1.780.2.16 src/distrib/sets/lists/base/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/base/mi diff -u src/distrib/sets/lists/base/mi:1.780.2.15 src/distrib/sets/lists/base/mi:1.780.2.16 --- src/distrib/sets/lists/base/mi:1.780.2.15 Sun Oct 18 16:50:13 2009 +++ src/distrib/sets/lists/base/mi Sun Oct 18 19:02:34 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.15 2009/10/18 16:50:13 bouyer Exp $ +# $NetBSD: mi,v 1.780.2.16 2009/10/18 19:02:34 snj Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -1082,6 +1082,7 @@ ./usr/include/g++/tr1base-cxx-usr ./usr/include/gssapibase-c-usr ./usr/include/gssapi/rpc base-obsolete obsolete +./usr/include/dev/pci/hdaudio base-c-usr ./usr/include/isofsbase-c-usr ./usr/include/isofs/cd9660 base-c-usr ./usr/include/kadm5base-c-usr
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Sun Oct 18 19:04:42 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1102. To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 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.121 src/doc/CHANGES-5.1:1.1.2.122 --- src/doc/CHANGES-5.1:1.1.2.121 Sun Oct 18 18:28:58 2009 +++ src/doc/CHANGES-5.1 Sun Oct 18 19:04:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.121 2009/10/18 18:28:58 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.122 2009/10/18 19:04:41 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14459,3 +14459,8 @@ Install hdaudio includes required by userland tools. [sborrill, ticket #1101] +distrib/sets/lists/base/mi 1.830 + + Add hdaudio directory to the base set list. + [sborrill, ticket #1102] +
CVS commit: src/lib/libpuffs
Module Name:src
Committed By: pooka
Date: Sun Oct 18 19:09:20 UTC 2009
Modified Files:
src/lib/libpuffs: puffs.c puffs.h
Log Message:
Make it possible to supply parameters to puffs_init() later (but
before puffs_mount()).
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.111 -r1.112 src/lib/libpuffs/puffs.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/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.99 src/lib/libpuffs/puffs.c:1.100
--- src/lib/libpuffs/puffs.c:1.99 Sat Oct 17 23:19:52 2009
+++ src/lib/libpuffs/puffs.c Sun Oct 18 19:09:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.c,v 1.99 2009/10/17 23:19:52 pooka Exp $ */
+/* $NetBSD: puffs.c,v 1.100 2009/10/18 19:09:20 pooka Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: puffs.c,v 1.99 2009/10/17 23:19:52 pooka Exp $);
+__RCSID($NetBSD: puffs.c,v 1.100 2009/10/18 19:09:20 pooka Exp $);
#endif /* !lint */
#include sys/param.h
@@ -276,6 +276,18 @@
pu-pu_privdata = privdata;
}
+void
+puffs_setmntinfo(struct puffs_usermount *pu,
+ const char *mntfromname, const char *puffsname)
+{
+ struct puffs_kargs *pargs = pu-pu_kargp;
+
+ (void)strlcpy(pargs-pa_mntfromname, mntfromname,
+ sizeof(pargs-pa_mntfromname));
+ (void)strlcpy(pargs-pa_typename, puffsname,
+ sizeof(pargs-pa_typename));
+}
+
size_t
puffs_getmaxreqlen(struct puffs_usermount *pu)
{
@@ -596,6 +608,13 @@
struct puffs_kargs *pargs;
int sverrno;
+ if (puffsname == PUFFS_DEFER)
+ puffsname = n/a;
+ if (mntfromname == PUFFS_DEFER)
+ mntfromname = n/a;
+ if (priv == PUFFS_DEFER)
+ priv = NULL;
+
pu = malloc(sizeof(struct puffs_usermount));
if (pu == NULL)
goto failfree;
@@ -609,10 +628,7 @@
pargs-pa_vers = PUFFSDEVELVERS | PUFFSVERSION;
pargs-pa_flags = PUFFS_FLAG_KERN(pflags);
fillvnopmask(pops, pargs-pa_vnopmask);
- (void)strlcpy(pargs-pa_typename, puffsname,
- sizeof(pargs-pa_typename));
- (void)strlcpy(pargs-pa_mntfromname, mntfromname,
- sizeof(pargs-pa_mntfromname));
+ puffs_setmntinfo(pu, mntfromname, puffsname);
puffs_zerostatvfs(pargs-pa_svfsb);
pargs-pa_root_cookie = NULL;
Index: src/lib/libpuffs/puffs.h
diff -u src/lib/libpuffs/puffs.h:1.111 src/lib/libpuffs/puffs.h:1.112
--- src/lib/libpuffs/puffs.h:1.111 Sat Oct 17 23:19:52 2009
+++ src/lib/libpuffs/puffs.h Sun Oct 18 19:09:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.h,v 1.111 2009/10/17 23:19:52 pooka Exp $ */
+/* $NetBSD: puffs.h,v 1.112 2009/10/18 19:09:20 pooka Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -418,6 +418,7 @@
__BEGIN_DECLS
+#define PUFFS_DEFER ((void *)-1)
struct puffs_usermount *_puffs_init(int, struct puffs_ops *, const char *,
const char *, void *, uint32_t);
int puffs_mount(struct puffs_usermount *, const char *, int, void*);
@@ -446,6 +447,8 @@
void puffs_setmaxreqlen(struct puffs_usermount *, size_t);
size_t puffs_getmaxreqlen(struct puffs_usermount *);
void puffs_setfhsize(struct puffs_usermount *, size_t, int);
+void puffs_setmntinfo(struct puffs_usermount *,
+ const char *, const char *);
void puffs_setncookiehash(struct puffs_usermount *, int);
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: stacktic
Date: Sun Oct 18 19:31:53 UTC 2009
Modified Files:
src/distrib/utils/sysinst: msg.mbr.fr msg.mi.fr
Log Message:
Corrected messages.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/msg.mbr.fr
cvs rdiff -u -r1.108 -r1.109 src/distrib/utils/sysinst/msg.mi.fr
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/msg.mbr.fr
diff -u src/distrib/utils/sysinst/msg.mbr.fr:1.14 src/distrib/utils/sysinst/msg.mbr.fr:1.15
--- src/distrib/utils/sysinst/msg.mbr.fr:1.14 Mon Sep 4 22:00:52 2006
+++ src/distrib/utils/sysinst/msg.mbr.fr Sun Oct 18 19:31:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.fr,v 1.14 2006/09/04 22:00:52 hubertf Exp $ */
+/* $NetBSD: msg.mbr.fr,v 1.15 2009/10/18 19:31:53 stacktic Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -43,15 +43,15 @@
choisir si vous voulez installer NetBSD sur la totalité du disque ou seulement
sur une partie de celui-ci.
Une installation sur une partie du disque crée une partition, ou `slice', pour
-NetBSD dans le secteur de démarage (Master Boot Record, alias MBR) de votre
+NetBSD dans le secteur de démarrage (Master Boot Record, alias MBR) de votre
disque. Une installation sur la totalité du disque est `dangereusement
dédiée' : elle réinitialise complétement le MBR, ce qui efface tout système
d'exploitation ou données existants sur le disque. Cela rend également
impossible l'installation ultérieure d'un deuxième système d'exploitation,
-sauf si vous reinstallez complètement NetBSD en utilisant uniquement une
+sauf si vous réinstallez complètement NetBSD en utilisant uniquement une
partie du disque.
-Que désirez vous faire ?
+Que désirez-vous faire ?
}
message Select_your_choice
@@ -80,12 +80,12 @@
message noactivepart
{Vous n'avez pas choisi de partition active.
Cela peut empêcher votre système de démarrer correctement.
-Dois-je marquer la partition NetBSD comme active?}
+Dois-je marquer la partition NetBSD comme active ?}
message setbiosgeom
{
La géométrie du disque doit être précisée.
-Veuillez entrez le nombre de secteurs par piste (maximum 63) et le nombre de
+Veuillez entrer le nombre de secteurs par piste (maximum 63) et le nombre de
têtes (maximum 256) que le BIOS utilise pour accéder au disque.
Le nombre de cylindres sera déduit de la taille du disque.
@@ -101,10 +101,10 @@
la géométrie utilisée par le BIOS soit de %d cylindres, %d secteurs et %d têtes\n}
message realgeom
-{ géom réelle: %d cylindres, %d têtes, %d secteurs (pour information)\n}
+{ géom réelle : %d cylindres, %d têtes, %d secteurs (pour information)\n}
message biosgeom
-{ géom fdisk: %d cylindres, %d têtes, %d secteurs \n}
+{ géom fdisk : %d cylindres, %d têtes, %d secteurs \n}
message ovrwrite
{Votre disque a actuellement une partition autre que NetBSD. Voulez-vous
@@ -115,28 +115,28 @@
{Partition OK}
message ptn_type
-{système de fichier: %s}
+{système de fichiers : %s}
message ptn_start
-{ Début: %d %s}
+{ Début : %d %s}
message ptn_size
-{taille: %d %s}
+{taille : %d %s}
message ptn_end
-{ fin: %d %s}
+{ fin : %d %s}
message ptn_active
-{active: %s}
+{active : %s}
message ptn_install
-{ installation: %s}
+{ installation : %s}
.if BOOTSEL
message bootmenu
-{ menu de boot: %s}
+{ menu de démarrage : %s}
message boot_dflt
-{ défaut: %s}
+{ défaut : %s}
.endif
message get_ptn_size {%staille (maximum %d %s)}
-message Invalid_numeric {Nombre invalide: }
+message Invalid_numeric {Nombre invalide : }
message Too_large {Trop grand : }
-message Space_allocated {Espace alloué: }
+message Space_allocated {Espace alloué : }
message ptn_starts {Espace à %d..%d %s (taille %d %s)\n}
message get_ptn_start {%s%sDébut (en %s)}
message get_ptn_id {Type de partition (0..255)}
@@ -145,15 +145,15 @@
message editparttable
-{Editez votre table de partition DOS. La table de partitions est :
+{Éditez votre table de partitions DOS. La table de partitions est :
}
message Partition_table_ok
-{Partition table OK}
+{Table des partitions OK}
message Delete_partition
-{Supprimer la Partition}
+{Supprimer la partition}
message Dont_change
{Ne pas modifier}
message Other_kind
@@ -163,7 +163,7 @@
message reeditpart
{
-Voulez-vous éditer de nouveau la table de partitions (ou abandonner l'installation)?
+Voulez-vous éditer de nouveau la table des partitions (ou abandonner l'installation) ?
}
message nobsdpart
@@ -175,11 +175,11 @@
Positionnez l'indicateur 'installation' sur celle à utiliser.}
message dofdisk
-{Configuration de la table de partition DOS ...
+{Configuration de la table de partition DOS...
}
message wmbrfail
-{L'écriture du MBR a échouée. Nous ne pouvons continuer.}
+{L'écriture du MBR a échoué. Nous ne pouvons continuer.}
.if 0
.if BOOTSEL
@@
CVS commit: src/lib/libp2k
Module Name:src
Committed By: pooka
Date: Sun Oct 18 19:36:41 UTC 2009
Modified Files:
src/lib/libp2k: p2k.c p2k.h
Log Message:
Split init routines a bit more to allow for p2k init without having
to pass any real configuration data. This benefits things like
rump_smbfs which need to init rump before running the userspace
mount routines (because they make rump system calls) but cannot
run p2k_setup() at that stage because it requires data provided by
the userspace mount routines. And p2k_setup() in turn forks (to
detach), so it cannot be run after rump has been inited and threads
have been created.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/lib/libp2k/p2k.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libp2k/p2k.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/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.25 src/lib/libp2k/p2k.c:1.26
--- src/lib/libp2k/p2k.c:1.25 Sat Oct 17 23:20:15 2009
+++ src/lib/libp2k/p2k.c Sun Oct 18 19:36:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p2k.c,v 1.25 2009/10/17 23:20:15 pooka Exp $ */
+/* $NetBSD: p2k.c,v 1.26 2009/10/18 19:36:41 pooka Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -235,34 +235,28 @@
}
/* just to avoid annoying loop when singlestepping */
-static void
-allocp2m(struct ukfs *ukfs)
+static struct p2k_mount *
+allocp2m(void)
{
struct p2k_mount *p2m;
int i;
p2m = malloc(sizeof(*p2m));
+ if (p2m == NULL)
+ return NULL;
memset(p2m, 0, sizeof(*p2m));
for (i = 0; i NHASHBUCK; i++)
LIST_INIT(p2m-p2m_vphash[i]);
- ukfs_setspecific(ukfs, p2m);
+
+ return p2m;
}
-static struct p2k_mount *
-setupfs(const char *vfsname, const char *devpath, int partition,
- const char *mountpath, int mntflags, void *arg, size_t alen,
- uint32_t puffs_flags)
+struct p2k_mount *
+p2k_init(uint32_t puffs_flags)
{
- char partpath[UKFS_PARTITION_MAXPATHLEN];
- char typebuf[PUFFS_TYPELEN];
struct puffs_ops *pops;
- struct puffs_usermount *pu = NULL;
- struct p2k_node *p2n_root;
- struct ukfs *ukfs = NULL;
- struct p2k_mount *p2m = NULL;
- extern int puffs_fakecc;
- int rv = -1, sverrno;
+ struct p2k_mount *p2m;
bool dodaemon;
PUFFSOP_INIT(pops);
@@ -320,11 +314,57 @@
puffs_flags |= PUFFS_KFLAG_NOCACHE;
}
+ p2m = allocp2m();
+ if (p2m == NULL)
+ return NULL;
+ p2m-p2m_pu = puffs_init(pops, PUFFS_DEFER, PUFFS_DEFER,
+ PUFFS_DEFER, puffs_flags);
+ if (p2m-p2m_pu == NULL) {
+ int sverrno = errno;
+ free(p2m);
+ errno = sverrno;
+ return NULL;
+ }
+
+ if (dodaemon) {
+ if (puffs_daemon(p2m-p2m_pu, 1, 1) == -1) {
+ int sverrno = errno;
+ p2k_cancel(p2m, sverrno);
+ errno = sverrno;
+ p2m = NULL;
+ }
+ }
+ if (p2m)
+ rump_init();
+
+ return p2m;
+}
+
+void
+p2k_cancel(struct p2k_mount *p2m, int error)
+{
+
+ puffs_cancel(p2m-p2m_pu, error);
+ free(p2m);
+}
+
+static int
+setupfs(struct p2k_mount *p2m, const char *vfsname, const char *devpath,
+ int partition, const char *mountpath, int mntflags,
+ void *arg, size_t alen)
+{
+ char partpath[UKFS_PARTITION_MAXPATHLEN];
+ char typebuf[PUFFS_TYPELEN];
+ struct puffs_usermount *pu = p2m-p2m_pu;
+ struct p2k_node *p2n_root;
+ struct ukfs *ukfs = NULL;
+ extern int puffs_fakecc;
+ int rv = -1, sverrno;
+
strcpy(typebuf, p2k|);
if (strcmp(vfsname, puffs) == 0) { /* XXX */
struct puffs_kargs *args = arg;
strlcat(typebuf, args-pa_typename, sizeof(typebuf));
- dodaemon = false;
} else {
strlcat(typebuf, vfsname, sizeof(typebuf));
}
@@ -339,12 +379,7 @@
} else {
strlcpy(partpath, devpath, sizeof(partpath));
}
- pu = puffs_init(pops, partpath, typebuf, NULL, puffs_flags);
- if (pu == NULL)
- goto out;
-
- if (dodaemon)
- puffs_daemon(pu, 1, 1);
+ puffs_setmntinfo(pu, partpath, typebuf);
if (ukfs_init() == -1)
goto out;
@@ -356,8 +391,7 @@
arg, alen);
if (ukfs == NULL)
goto out;
- allocp2m(ukfs);
- p2m = ukfs_getspecific(ukfs);
+ ukfs_setspecific(ukfs, p2m);
p2m-p2m_ukfs = ukfs;
p2m-p2m_pu = pu;
@@ -370,23 +404,19 @@
puffs_set_errnotify(pu, p2k_errcatcher);
puffs_setspecific(pu, ukfs);
- if ((rv = puffs_mount(pu, mountpath, mntflags, p2n_root))== -1)
- goto out;
+ rv = puffs_mount(pu, mountpath, mntflags, p2n_root);
out:
- sverrno = errno;
- if (rv) {
+ if (rv == -1) {
+ sverrno = errno;
+ puffs_cancel(pu, sverrno);
if (ukfs)
ukfs_release(p2m-p2m_ukfs, UKFS_RELFLAG_FORCE);
- if (pu)
- puffs_cancel(pu, sverrno);
- if (p2m)
- free(p2m);
+ free(p2m);
errno = sverrno;
- p2m = NULL;
}
- return p2m;
+ return rv;
}
int
@@ -411,11 +441,15 @@
int mntflags, void *arg, size_t alen, uint32_t puffs_flags)
{
struct p2k_mount *p2m;
+ int rv;
- p2m = setupfs(vfsname, devpath, UKFS_PARTITION_NA, mountpath,
- mntflags, arg, alen, puffs_flags);
+ p2m = p2k_init(puffs_flags);
if (p2m == NULL)
return -1;
+ rv = setupfs(p2m, vfsname, devpath,
CVS commit: src/usr.sbin/puffs/rump_lfs
Module Name:src Committed By: pooka Date: Sun Oct 18 19:37:25 UTC 2009 Modified Files: src/usr.sbin/puffs/rump_lfs: rump_lfs.c Log Message: adapt to new p2k interfaces To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_lfs/rump_lfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/rump_lfs/rump_lfs.c diff -u src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.9 src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.10 --- src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.9 Wed Oct 14 18:22:50 2009 +++ src/usr.sbin/puffs/rump_lfs/rump_lfs.c Sun Oct 18 19:37:25 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_lfs.c,v 1.9 2009/10/14 18:22:50 pooka Exp $ */ +/* $NetBSD: rump_lfs.c,v 1.10 2009/10/18 19:37:25 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -106,9 +106,11 @@ cleaner(canon_dir); #endif - p2m = p2k_setup_diskfs(MOUNT_LFS, canon_dev, part, canon_dir, mntflags, - args, sizeof(args), 0); + p2m = p2k_init(0); if (!p2m) + err(1, init p2k); + if (p2k_setup_diskfs(p2m, MOUNT_LFS, canon_dev, part, canon_dir, + mntflags, args, sizeof(args)) == -1) err(1, mount); #ifndef CLEANER_TESTING
CVS commit: src/usr.sbin/puffs/rump_smbfs
Module Name:src
Committed By: pooka
Date: Sun Oct 18 19:38:35 UTC 2009
Modified Files:
src/usr.sbin/puffs/rump_smbfs: rump_smbfs.c
Log Message:
Use new p2k interfaces and make it possible to detach rump_smbfs
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c
diff -u src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.2 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.3
--- src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.2 Sun Oct 18 15:14:13 2009
+++ src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c Sun Oct 18 19:38:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_smbfs.c,v 1.2 2009/10/18 15:14:13 pooka Exp $ */
+/* $NetBSD: rump_smbfs.c,v 1.3 2009/10/18 19:38:35 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -41,30 +41,39 @@
#include mount_smbfs.h
+struct p2k_mount *docancel;
+static void
+pcancel(void)
+{
+
+ abort();
+ if (docancel)
+ p2k_cancel(docancel, 0);
+}
+
int
main(int argc, char *argv[])
{
struct smbfs_args args;
char canon_dev[MAXPATHLEN], canon_dir[MAXPATHLEN];
+ struct p2k_mount *p2m;
int rv, mntflags;
setprogname(argv[0]);
- /*
- * XXX: rump_init() creates threads, we cannot detach after that.
- * so let's call rump_smbfs work in progress and force debugging
- * mode ;) (I should go into marketing)
- */
- printf(rump_smbfs is work-in-progress. forcing debug mode\n);
- setenv(P2K_DEBUG, 1, 1);
- rump_init();
+ p2m = p2k_init(PUFFS_KFLAG_WTCACHE);
+ atexit(pcancel);
+ docancel = p2m;
+ /* XXX: this will exit upon error. therefore kludge with atexit */
mount_smbfs_parseargs(argc, argv, args, mntflags,
canon_dev, canon_dir);
+ docancel = NULL;
- rv = p2k_run_fs(MOUNT_SMBFS, canon_dev, canon_dir, mntflags, args,
- sizeof(args), PUFFS_KFLAG_WTCACHE);
- if (rv == -1)
+ if (p2k_setup_fs(p2m, MOUNT_SMBFS, canon_dev, canon_dir, mntflags,
+ args, sizeof(args)) == -1)
err(1, mount);
+ if (p2k_mainloop(p2m) == -1)
+ err(1, fs service);
return 0;
}
CVS commit: src/usr.sbin/puffs/rump_smbfs
Module Name:src
Committed By: pooka
Date: Sun Oct 18 19:58:04 UTC 2009
Modified Files:
src/usr.sbin/puffs/rump_smbfs: rump_smbfs.c
Log Message:
remove abort trap leftover from my testing
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c
diff -u src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.3 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.4
--- src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.3 Sun Oct 18 19:38:35 2009
+++ src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c Sun Oct 18 19:58:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_smbfs.c,v 1.3 2009/10/18 19:38:35 pooka Exp $ */
+/* $NetBSD: rump_smbfs.c,v 1.4 2009/10/18 19:58:04 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -46,7 +46,6 @@
pcancel(void)
{
- abort();
if (docancel)
p2k_cancel(docancel, 0);
}
CVS commit: src/lib/libpuffs
Module Name:src Committed By: pooka Date: Sun Oct 18 20:14:06 UTC 2009 Modified Files: src/lib/libpuffs: null.c Log Message: include some headers we use To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libpuffs/null.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/libpuffs/null.c diff -u src/lib/libpuffs/null.c:1.27 src/lib/libpuffs/null.c:1.28 --- src/lib/libpuffs/null.c:1.27 Thu Jan 8 02:19:48 2009 +++ src/lib/libpuffs/null.c Sun Oct 18 20:14:06 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: null.c,v 1.27 2009/01/08 02:19:48 lukem Exp $ */ +/* $NetBSD: null.c,v 1.28 2009/10/18 20:14:06 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -27,7 +27,7 @@ #include sys/cdefs.h #if !defined(lint) -__RCSID($NetBSD: null.c,v 1.27 2009/01/08 02:19:48 lukem Exp $); +__RCSID($NetBSD: null.c,v 1.28 2009/10/18 20:14:06 pooka Exp $); #endif /* !lint */ /* @@ -36,6 +36,7 @@ */ #include sys/types.h +#include sys/stat.h #include sys/time.h #include assert.h @@ -45,6 +46,7 @@ #include puffs.h #include stdio.h #include stdlib.h +#include time.h #include unistd.h PUFFSOP_PROTOS(puffs_null)
CVS commit: src
Module Name:src Committed By: pooka Date: Sun Oct 18 20:26:33 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.mi src/lib/libpuffs: shlib_version Log Message: bump minor for puffs_setmntinfo() To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.500 -r1.501 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.3 -r1.4 src/lib/libpuffs/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.71 src/distrib/sets/lists/base/md.amd64:1.72 --- src/distrib/sets/lists/base/md.amd64:1.71 Sun Oct 11 08:19:57 2009 +++ src/distrib/sets/lists/base/md.amd64 Sun Oct 18 20:26:33 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.71 2009/10/11 08:19:57 mrg Exp $ +# $NetBSD: md.amd64,v 1.72 2009/10/18 20:26:33 pooka Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -161,7 +161,7 @@ ./usr/lib/i386/libpthread_dbg.so.2 base-compat-shlib compat,pic ./usr/lib/i386/libpthread_dbg.so.2.0 base-compat-shlib compat,pic ./usr/lib/i386/libpuffs.so.1 base-compat-shlib compat,pic -./usr/lib/i386/libpuffs.so.1.0 base-compat-shlib compat,pic +./usr/lib/i386/libpuffs.so.1.1 base-compat-shlib compat,pic ./usr/lib/i386/libradius.so.4 base-compat-shlib compat,pic ./usr/lib/i386/libradius.so.4.0 base-compat-shlib compat,pic ./usr/lib/i386/librefuse.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.64 src/distrib/sets/lists/base/md.sparc64:1.65 --- src/distrib/sets/lists/base/md.sparc64:1.64 Sun Oct 11 08:19:57 2009 +++ src/distrib/sets/lists/base/md.sparc64 Sun Oct 18 20:26:33 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.64 2009/10/11 08:19:57 mrg Exp $ +# $NetBSD: md.sparc64,v 1.65 2009/10/18 20:26:33 pooka Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin @@ -157,7 +157,7 @@ ./usr/lib/sparc/libpthread_dbg.so.2 base-compat-shlib compat,pic ./usr/lib/sparc/libpthread_dbg.so.2.0 base-compat-shlib compat,pic ./usr/lib/sparc/libpuffs.so.1 base-compat-shlib compat,pic -./usr/lib/sparc/libpuffs.so.1.0 base-compat-shlib compat,pic +./usr/lib/sparc/libpuffs.so.1.1 base-compat-shlib compat,pic ./usr/lib/sparc/libradius.so.4 base-compat-shlib compat,pic ./usr/lib/sparc/libradius.so.4.0 base-compat-shlib compat,pic ./usr/lib/sparc/librefuse.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.500 src/distrib/sets/lists/base/shl.mi:1.501 --- src/distrib/sets/lists/base/shl.mi:1.500 Sun Oct 11 11:26:40 2009 +++ src/distrib/sets/lists/base/shl.mi Sun Oct 18 20:26:33 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.500 2009/10/11 11:26:40 pooka Exp $ +# $NetBSD: shl.mi,v 1.501 2009/10/18 20:26:33 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -114,7 +114,7 @@ ./usr/lib/libprop.so.1.1 base-sys-shlib ./usr/lib/libpthread.so.1.0 base-sys-shlib ./usr/lib/libpthread_dbg.so.2.0 base-sys-shlib -./usr/lib/libpuffs.so.1.0 base-puffs-shlib +./usr/lib/libpuffs.so.1.1 base-puffs-shlib ./usr/lib/libradius.so.4.0 base-net-shlib ./usr/lib/librefuse.so.1.0 base-refuse-shlib ./usr/lib/libresolv.so.2.0 base-net-shlib Index: src/lib/libpuffs/shlib_version diff -u src/lib/libpuffs/shlib_version:1.3 src/lib/libpuffs/shlib_version:1.4 --- src/lib/libpuffs/shlib_version:1.3 Sat Oct 17 21:36:02 2009 +++ src/lib/libpuffs/shlib_version Sun Oct 18 20:26:33 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.3 2009/10/17 21:36:02 pooka Exp $ +# $NetBSD: shlib_version,v 1.4 2009/10/18 20:26:33 pooka Exp $ # # @@ -9,4 +9,4 @@ #2) get rid of PUFFS_DEVEL_LIBVERSION # major=1 -minor=0 +minor=1
CVS commit: src/etc/rc.d
Module Name:src Committed By: haad Date: Sun Oct 18 21:58:37 UTC 2009 Modified Files: src/etc/rc.d: mountall Log Message: Add zfs volinit command, suggested by tnn@ this will initialize all zvols defined in a system. So they can be mounted from fstab as regular block devices. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/mountall 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/mountall diff -u src/etc/rc.d/mountall:1.7 src/etc/rc.d/mountall:1.8 --- src/etc/rc.d/mountall:1.7 Mon Oct 5 22:39:27 2009 +++ src/etc/rc.d/mountall Sun Oct 18 21:58:37 2009 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mountall,v 1.7 2009/10/05 22:39:27 haad Exp $ +# $NetBSD: mountall,v 1.8 2009/10/18 21:58:37 haad Exp $ # # REQUIRE: mountcritremote named ypbind @@ -18,6 +18,8 @@ if [ -f /etc/zfs/zpool.cache ]; then # Get ZFS module loaded (and thereby, zvols created). zfs list /dev/null 21 + # Initialize zvols so they can be mounted + zfs volinit # Mount file systems noted in fstab. mount -a # Mount ZFS file systems.
CVS commit: src/sys/netsmb
Module Name:src
Committed By: tron
Date: Sun Oct 18 22:53:36 UTC 2009
Modified Files:
src/sys/netsmb: smb_smb.c
Log Message:
Fix detection of SMB capabilities according to the CIFS spec:
1.) SMB_CAP_LARGE_FILES advertises support for 64-bit file offsets.
2.) SMB_CAP_LARGE_READX and SMB_CAP_LARGE_WRITEX advertise support for
large reads and writes (larger than 64KB).
The code previously only used SMB_CAP_LARGE_READX and SMB_CAP_LARGE_WRITEX
which is not correct and doesn't work for the Apple Time Capsule which
only supports SMB_CAP_LARGE_FILES. With these changes SMBFS can copy a
5GB to a Time Capsule and read it back without problems.
Thanks a lot to Allen Briggs for pointing out the broke assumptions
and explaining the CIFS spec to me. This fixes PR kern/42175.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/netsmb/smb_smb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netsmb/smb_smb.c
diff -u src/sys/netsmb/smb_smb.c:1.30 src/sys/netsmb/smb_smb.c:1.31
--- src/sys/netsmb/smb_smb.c:1.30 Wed Mar 18 16:00:24 2009
+++ src/sys/netsmb/smb_smb.c Sun Oct 18 22:53:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_smb.c,v 1.30 2009/03/18 16:00:24 cegger Exp $ */
+/* $NetBSD: smb_smb.c,v 1.31 2009/10/18 22:53:36 tron Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.30 2009/03/18 16:00:24 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.31 2009/10/18 22:53:36 tron Exp $);
#include sys/param.h
#include sys/systm.h
@@ -594,6 +594,22 @@
u_int16_t residhi, residlo, off, doff;
u_int32_t resid;
+ if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_FILES)
+ uio-uio_offset = (1LL 32)) {
+ /* Cannot read at/beyond 4G */
+ return (EFBIG);
+ }
+
+ if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_WRITEX)) {
+ size_t blksz;
+
+ blksz = SSTOVC(ssp)-vc_txmax - SMB_HDRLEN - 64;
+ if (blksz 0x)
+ blksz = 0x;
+
+ *len = min(blksz, *len);
+ }
+
error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_READ_ANDX, scred, rqp);
if (error)
return error;
@@ -674,8 +690,26 @@
u_int8_t wc;
u_int16_t resid;
+ if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_FILES)
+ uio-uio_offset = (1LL 32)) {
+ /* Cannot write at/beyond 4G */
+ return (EFBIG);
+ }
+
+ if (SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_WRITEX) {
+ *len = min(SSTOVC(ssp)-vc_wxmax, *len);
+ } else {
+ size_t blksz;
+
+ blksz = SSTOVC(ssp)-vc_txmax - SMB_HDRLEN - 64;
+ if (blksz 0x)
+ blksz = 0x;
+
+ *len = min(blksz, *len);
+ }
+
error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_WRITE_ANDX, scred, rqp);
- if (error)
+ if (error != 0)
return (error);
smb_rq_getrequest(rqp, mbp);
smb_rq_wstart(rqp);
@@ -687,7 +721,6 @@
mb_put_uint32le(mbp, 0); /* MBZ (timeout) */
mb_put_uint16le(mbp, 0); /* !write-thru */
mb_put_uint16le(mbp, 0);
- *len = min(SSTOVC(ssp)-vc_wxmax, *len);
mb_put_uint16le(mbp, *len 16);
mb_put_uint16le(mbp, *len);
mb_put_uint16le(mbp, 64); /* data offset from header start */
@@ -785,7 +818,8 @@
{
size_t tsize, len, resid;
int error = 0;
- int rx = (SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_READX);
+ bool rx = (SMB_CAPS(SSTOVC(ssp))
+ (SMB_CAP_LARGE_FILES|SMB_CAP_LARGE_READX)) != 0;
resid = 0; /* XXX gcc */
@@ -866,7 +900,8 @@
{
int error = 0;
size_t len, tsize, resid;
- int wx = (SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_WRITEX);
+ bool wx = (SMB_CAPS(SSTOVC(ssp))
+ (SMB_CAP_LARGE_FILES|SMB_CAP_LARGE_WRITEX)) != 0;
resid = 0; /* XXX gcc */
@@ -877,7 +912,7 @@
error = smb_smb_writex(ssp, fid, len, resid, uio, scred);
else
error = smb_smb_write(ssp, fid, len, resid, uio, scred);
- if (error)
+ if (error != 0)
break;
if (resid len) {
error = EIO;
CVS commit: src/sys/rump/net/lib/libsockin
Module Name:src
Committed By: tron
Date: Sun Oct 18 22:55:56 UTC 2009
Modified Files:
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
Avoid panic if a file system tries to write a chain of more than 32 mbuf-s
to a socket. This happens e.g. when copying large files to SMBFS.
Code reviewed by Antti Kantee.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/net/lib/libsockin/sockin.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/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.18 src/sys/rump/net/lib/libsockin/sockin.c:1.19
--- src/sys/rump/net/lib/libsockin/sockin.c:1.18 Sat Oct 17 20:35:52 2009
+++ src/sys/rump/net/lib/libsockin/sockin.c Sun Oct 18 22:55:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.18 2009/10/17 20:35:52 pooka Exp $ */
+/* $NetBSD: sockin.c,v 1.19 2009/10/18 22:55:56 tron Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.18 2009/10/17 20:35:52 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.19 2009/10/18 22:55:56 tron Exp $);
#include sys/param.h
#include sys/condvar.h
@@ -407,17 +407,25 @@
{
struct sockaddr *saddr;
struct msghdr mhdr;
- struct iovec iov[32];
+ size_t iov_max, i;
+ struct iovec *iov;
struct mbuf *m2;
size_t tot;
- int i, s;
+ int s;
memset(mhdr, 0, sizeof(mhdr));
+ iov_max = 0;
+ for (m2 = m; m2 != NULL; m2 = m2-m_next) {
+ iov_max++;
+ }
+ if (iov_max == 0)
+ iov_max = 1;
+
+ iov = kmem_alloc(sizeof(struct iovec) * iov_max, KM_SLEEP);
+
tot = 0;
- for (i = 0, m2 = m; m2; m2 = m2-m_next, i++) {
- if (i = 32)
-panic(lazy bum);
+ for (i = 0, m2 = m; m2 != NULL; m2 = m2-m_next, i++) {
iov[i].iov_base = m2-m_data;
iov[i].iov_len = m2-m_len;
tot += m2-m_len;
@@ -426,7 +434,7 @@
mhdr.msg_iovlen = i;
s = SO2S(so);
- if (nam) {
+ if (nam != NULL) {
saddr = mtod(nam, struct sockaddr *);
mhdr.msg_name = saddr;
mhdr.msg_namelen = saddr-sa_len;
@@ -434,6 +442,8 @@
rumpuser_net_sendmsg(s, mhdr, 0, error);
+ kmem_free(iov, sizeof(struct iovec) * iov_max);
+
m_freem(m);
m_freem(control);
CVS commit: src/sys/netinet6
Module Name:src
Committed By: christos
Date: Sun Oct 18 22:57:05 UTC 2009
Modified Files:
src/sys/netinet6: icmp6.c
Log Message:
fix the sun2 case for real.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/netinet6/icmp6.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/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.154 src/sys/netinet6/icmp6.c:1.155
--- src/sys/netinet6/icmp6.c:1.154 Mon Oct 12 18:32:23 2009
+++ src/sys/netinet6/icmp6.c Sun Oct 18 18:57:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.154 2009/10/12 22:32:23 christos Exp $ */
+/* $NetBSD: icmp6.c,v 1.155 2009/10/18 22:57:05 christos Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: icmp6.c,v 1.154 2009/10/12 22:32:23 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: icmp6.c,v 1.155 2009/10/18 22:57:05 christos Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -2383,7 +2383,7 @@
MGETHDR(m, M_DONTWAIT, MT_HEADER);
if (m IPV6_MMTU = MHLEN) {
#if IPV6_MMTU = MCLBYTES
- _MCLGET(m, mclpool_cache, IPV6_MMTU, M_DONTWAIT);
+ _MCLGET(m, mcl_cache, IPV6_MMTU, M_DONTWAIT);
#else
MCLGET(m, M_DONTWAIT);
#endif
CVS commit: src/sys/netsmb
Module Name:src
Committed By: tron
Date: Sun Oct 18 23:20:31 UTC 2009
Modified Files:
src/sys/netsmb: smb_smb.c
Log Message:
Fix cut paste error spotted by Nicolas Joly.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/netsmb/smb_smb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netsmb/smb_smb.c
diff -u src/sys/netsmb/smb_smb.c:1.31 src/sys/netsmb/smb_smb.c:1.32
--- src/sys/netsmb/smb_smb.c:1.31 Sun Oct 18 22:53:36 2009
+++ src/sys/netsmb/smb_smb.c Sun Oct 18 23:20:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_smb.c,v 1.31 2009/10/18 22:53:36 tron Exp $ */
+/* $NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.31 2009/10/18 22:53:36 tron Exp $);
+__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $);
#include sys/param.h
#include sys/systm.h
@@ -600,7 +600,7 @@
return (EFBIG);
}
- if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_WRITEX)) {
+ if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_READX)) {
size_t blksz;
blksz = SSTOVC(ssp)-vc_txmax - SMB_HDRLEN - 64;
CVS commit: src/gnu/usr.bin/gettext/libnlsut
Module Name:src Committed By: christos Date: Sun Oct 18 23:47:43 UTC 2009 Modified Files: src/gnu/usr.bin/gettext/libnlsut: Makefile Log Message: we have getdelim and getline, no need for a separate copy here. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/gettext/libnlsut/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/gettext/libnlsut/Makefile diff -u src/gnu/usr.bin/gettext/libnlsut/Makefile:1.7 src/gnu/usr.bin/gettext/libnlsut/Makefile:1.8 --- src/gnu/usr.bin/gettext/libnlsut/Makefile:1.7 Sat May 3 10:48:30 2008 +++ src/gnu/usr.bin/gettext/libnlsut/Makefile Sun Oct 18 19:47:43 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:30 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2009/10/18 23:47:43 christos Exp $ LIBISPRIVATE= yes @@ -30,7 +30,6 @@ fwriteerror.c \ full-write.c \ gcd.c \ -getline.c \ getndelim2.c \ hash.c \ javacomp.c \
CVS commit: src/gnu/usr.bin/gettext/libnlsut
Module Name:src Committed By: christos Date: Mon Oct 19 00:28:19 UTC 2009 Modified Files: src/gnu/usr.bin/gettext/libnlsut: Makefile Log Message: put back getline. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/gnu/usr.bin/gettext/libnlsut/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/gettext/libnlsut/Makefile diff -u src/gnu/usr.bin/gettext/libnlsut/Makefile:1.8 src/gnu/usr.bin/gettext/libnlsut/Makefile:1.9 --- src/gnu/usr.bin/gettext/libnlsut/Makefile:1.8 Sun Oct 18 19:47:43 2009 +++ src/gnu/usr.bin/gettext/libnlsut/Makefile Sun Oct 18 20:28:19 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/10/18 23:47:43 christos Exp $ +# $NetBSD: Makefile,v 1.9 2009/10/19 00:28:19 christos Exp $ LIBISPRIVATE= yes @@ -30,6 +30,7 @@ fwriteerror.c \ full-write.c \ gcd.c \ +getline.c \ getndelim2.c \ hash.c \ javacomp.c \
CVS commit: src/gnu/dist/gettext/gettext-tools/lib
Module Name:src Committed By: christos Date: Mon Oct 19 00:29:30 UTC 2009 Modified Files: src/gnu/dist/gettext/gettext-tools/lib: getline.c Log Message: if we have getdelim, we don't need to supply our own, always. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/gnu/dist/gettext/gettext-tools/lib/getline.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/gettext/gettext-tools/lib/getline.c diff -u src/gnu/dist/gettext/gettext-tools/lib/getline.c:1.1.1.1 src/gnu/dist/gettext/gettext-tools/lib/getline.c:1.2 --- src/gnu/dist/gettext/gettext-tools/lib/getline.c:1.1.1.1 Fri Apr 29 11:02:36 2005 +++ src/gnu/dist/gettext/gettext-tools/lib/getline.c Sun Oct 18 20:29:30 2009 @@ -32,7 +32,7 @@ /* Get ssize_t. */ #include sys/types.h -#if defined __GNU_LIBRARY__ HAVE_GETDELIM +#if HAVE_GETDELIM ssize_t getline (char **lineptr, size_t *linesize, FILE *stream)
CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua
Module Name:src
Committed By: agc
Date: Mon Oct 19 01:07:08 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: Makefile netpgp.lua
Log Message:
Use LD_LIBRARY_PATH to manage the library path, and don't try to second
guess from the lua driver program
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.2 src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.3
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.2 Sun Oct 18 07:15:43 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile Mon Oct 19 01:07:08 2009
@@ -11,6 +11,9 @@
WARNS=4
.include bsd.lib.mk
+.include bsd.own.mk
+
+LUANETPGPOBJDIR != cd ${.CURDIR} ${PRINTOBJDIR}
OPSYS!= uname -s
@@ -28,6 +31,6 @@
.else
t:
cp Makefile a
- ./netpgp.lua --sign --detached a
- ./netpgp.lua --verify a.sig
+ env LD_LIBRARY_PATH=${LUANETPGPOBJDIR}:/lib:/usr/lib:${PREFIX}/lib ./netpgp.lua --sign --detached a
+ env LD_LIBRARY_PATH=${LUANETPGPOBJDIR}:/lib:/usr/lib:${PREFIX}/lib ./netpgp.lua --verify a.sig
.endif
Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.3 src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.4
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.3 Sun Oct 18 07:23:37 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua Mon Oct 19 01:07:08 2009
@@ -50,8 +50,7 @@
extension = .dylib
io.close(f)
end
-glupkg = package.loadlib(./ .. libluanetpgp .. extension,
- luaopen_netpgp)
+glupkg = package.loadlib(libluanetpgp .. extension, luaopen_netpgp)
netpgp = glupkg()
-- initialise
CVS commit: src/external/gpl2/xcvs/lib/libcvs
Module Name:src Committed By: christos Date: Mon Oct 19 01:24:19 UTC 2009 Modified Files: src/external/gpl2/xcvs/lib/libcvs: Makefile Log Message: we have getdelim and getline. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/lib/libcvs/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/gpl2/xcvs/lib/libcvs/Makefile diff -u src/external/gpl2/xcvs/lib/libcvs/Makefile:1.6 src/external/gpl2/xcvs/lib/libcvs/Makefile:1.7 --- src/external/gpl2/xcvs/lib/libcvs/Makefile:1.6 Sun May 3 13:13:07 2009 +++ src/external/gpl2/xcvs/lib/libcvs/Makefile Sun Oct 18 21:24:19 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/05/03 17:13:07 christos Exp $ +# $NetBSD: Makefile,v 1.7 2009/10/19 01:24:19 christos Exp $ LIBISPRIVATE= yes @@ -12,7 +12,7 @@ SRCS= __fpending.c asnprintf.c basename.c canon-host.c canonicalize.c \ chdir-long.c closeout.c cycle-check.c dirname.c dup-safer.c exitfail.c \ - fd-safer.c getdate.c getdelim.c getline.c gettime.c md5.c \ + fd-safer.c getdate.c gettime.c md5.c \ openat.c pagealign_alloc.c printf-args.c printf-parse.c \ quotearg.c regex.c rpmatch.c save-cwd.c sighandle.c strftime.c \ stripslash.c vasnprintf.c xalloc-die.c xgetcwd.c xgethostname.c \
CVS commit: src/sys/miscfs/procfs
Module Name:src Committed By: dholland Date: Mon Oct 19 01:25:29 UTC 2009 Modified Files: src/sys/miscfs/procfs: procfs_linux.c Log Message: Avoid leaking pages. Fixes PR 42053 from SHIMIZU Ryo. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/miscfs/procfs/procfs_linux.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/miscfs/procfs/procfs_linux.c diff -u src/sys/miscfs/procfs/procfs_linux.c:1.57 src/sys/miscfs/procfs/procfs_linux.c:1.58 --- src/sys/miscfs/procfs/procfs_linux.c:1.57 Sun Jan 11 03:16:33 2009 +++ src/sys/miscfs/procfs/procfs_linux.c Mon Oct 19 01:25:29 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_linux.c,v 1.57 2009/01/11 03:16:33 christos Exp $ */ +/* $NetBSD: procfs_linux.c,v 1.58 2009/10/19 01:25:29 dholland Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: procfs_linux.c,v 1.57 2009/01/11 03:16:33 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: procfs_linux.c,v 1.58 2009/10/19 01:25:29 dholland Exp $); #include sys/param.h #include sys/systm.h @@ -379,6 +379,8 @@ (unsigned long)(vm-vm_ssize), /* stack size in pages */ (unsigned long) 0); + uvmspace_free(vm); + if (len == 0) goto out; @@ -483,6 +485,8 @@ mutex_exit(p-p_lock); mutex_exit(proc_lock); + uvmspace_free(vm); + if (len == 0) goto out;
CVS commit: src/games/rogue
Module Name:src
Committed By: dholland
Date: Mon Oct 19 02:34:40 UTC 2009
Modified Files:
src/games/rogue: monster.c
Log Message:
Fix '=' for '==' in a test. From NAKAJIMA Yoshihiro in PR 42177.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/games/rogue/monster.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/rogue/monster.c
diff -u src/games/rogue/monster.c:1.15 src/games/rogue/monster.c:1.16
--- src/games/rogue/monster.c:1.15 Wed Aug 12 08:44:45 2009
+++ src/games/rogue/monster.c Mon Oct 19 02:34:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: monster.c,v 1.15 2009/08/12 08:44:45 dholland Exp $ */
+/* $NetBSD: monster.c,v 1.16 2009/10/19 02:34:40 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)monster.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: monster.c,v 1.15 2009/08/12 08:44:45 dholland Exp $);
+__RCSID($NetBSD: monster.c,v 1.16 2009/10/19 02:34:40 dholland Exp $);
#endif
#endif /* not lint */
@@ -679,7 +679,7 @@
for (i = 0; i 9; i++) {
rand_around(i, row, col);
- if (((row == rogue.row) (col = rogue.col)) ||
+ if (((row == rogue.row) (col == rogue.col)) ||
(row MIN_ROW) || (row (DROWS-2)) ||
(col 0) || (col (DCOLS-1))) {
continue;
CVS commit: src/crypto/external/bsd/netpgp/dist/bindings/lua
Module Name:src
Committed By: agc
Date: Mon Oct 19 05:17:46 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: Makefile
Log Message:
Add 'a' and 'a.sig' to CLEANFILES - from Marc Balmer
Wrap long lines
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.3 src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.4
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.3 Mon Oct 19 01:07:08 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile Mon Oct 19 05:17:46 2009
@@ -9,6 +9,7 @@
CPPFLAGS+=-g -I${PREFIX}/pkg/include
LDADD+= -lnetpgp
WARNS=4
+CLEANFILES+= a a.sig
.include bsd.lib.mk
.include bsd.own.mk
@@ -31,6 +32,8 @@
.else
t:
cp Makefile a
- env LD_LIBRARY_PATH=${LUANETPGPOBJDIR}:/lib:/usr/lib:${PREFIX}/lib ./netpgp.lua --sign --detached a
- env LD_LIBRARY_PATH=${LUANETPGPOBJDIR}:/lib:/usr/lib:${PREFIX}/lib ./netpgp.lua --verify a.sig
+ env LD_LIBRARY_PATH=${LUANETPGPOBJDIR}:/lib:/usr/lib:${PREFIX}/lib \
+ ./netpgp.lua --sign --detached a
+ env LD_LIBRARY_PATH=${LUANETPGPOBJDIR}:/lib:/usr/lib:${PREFIX}/lib \
+ ./netpgp.lua --verify a.sig
.endif
