CVS commit: [matt-nb5-mips64] src/sys/arch/sbmips/conf
Module Name:src Committed By: matt Date: Thu Aug 20 06:52:43 UTC 2009 Added Files: src/sys/arch/sbmips/conf [matt-nb5-mips64]: GENERIC64 Log Message: This config will build a N64 (64-bit) kernel. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/sbmips/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/sbmips/conf/GENERIC64 diff -u /dev/null src/sys/arch/sbmips/conf/GENERIC64:1.1.2.1 --- /dev/null Thu Aug 20 06:52:43 2009 +++ src/sys/arch/sbmips/conf/GENERIC64 Thu Aug 20 06:52:43 2009 @@ -0,0 +1,5 @@ + +include "arch/sbmips/conf/GENERIC" + +makeoptions LP64="yes" +options EXEC_ELF64
CVS commit: [matt-nb5-mips64] src/sys/arch/sbmips/conf
Module Name:src Committed By: matt Date: Thu Aug 20 06:51:40 UTC 2009 Modified Files: src/sys/arch/sbmips/conf [matt-nb5-mips64]: std.sbmips Log Message: When building sbmips kernels, always use compile with -mips64 -mtune=sb1 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.96.1 src/sys/arch/sbmips/conf/std.sbmips 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/sbmips/conf/std.sbmips diff -u src/sys/arch/sbmips/conf/std.sbmips:1.5 src/sys/arch/sbmips/conf/std.sbmips:1.5.96.1 --- src/sys/arch/sbmips/conf/std.sbmips:1.5 Sun Dec 11 12:18:51 2005 +++ src/sys/arch/sbmips/conf/std.sbmips Thu Aug 20 06:51:40 2009 @@ -1,14 +1,16 @@ -# $NetBSD: std.sbmips,v 1.5 2005/12/11 12:18:51 christos Exp $ +# $NetBSD: std.sbmips,v 1.5.96.1 2009/08/20 06:51:40 matt Exp $ machine sbmips mips include "conf/std" # MI standard options -options MIPS64 -options MIPS64_SB1 # we use an SB1 core +options MIPS64 +options MIPS64_SB1 # we use an SB1 core -options EXEC_ELF32 # exec ELF32 binaries -options EXEC_SCRIPT # exec #! scripts +options EXEC_ELF32 # exec ELF32 binaries +options EXEC_SCRIPT # exec #! scripts +makeoptions CFLAGS+="-mips64 -mtune=sb1" +makeoptions AFLAGS+="-mips64 -mtune=sb1" makeoptions DEFTEXTADDR="0x80001000" include "arch/mips/conf/files.sibyte"
CVS commit: src/usr.bin/sort
Module Name:src
Committed By: dsl
Date: Thu Aug 20 06:36:26 UTC 2009
Modified Files:
src/usr.bin/sort: append.c fields.c fsort.c fsort.h msort.c sort.c
sort.h
Log Message:
Delete more unwanted/unused cruft.
Simplify logic for reading input records.
Do a merge sort whenever we have 16 partial sorted blocks.
The patient is breathing, but still carrying a lot of extra weight.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/sort/append.c
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/sort/fields.c src/usr.bin/sort/sort.h
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/sort/fsort.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/sort/fsort.h
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/sort/msort.c
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/sort/sort.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sort/append.c
diff -u src/usr.bin/sort/append.c:1.18 src/usr.bin/sort/append.c:1.19
--- src/usr.bin/sort/append.c:1.18 Tue Aug 18 18:00:28 2009
+++ src/usr.bin/sort/append.c Thu Aug 20 06:36:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: append.c,v 1.18 2009/08/18 18:00:28 dsl Exp $ */
+/* $NetBSD: append.c,v 1.19 2009/08/20 06:36:25 dsl Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include "sort.h"
#ifndef lint
-__RCSID("$NetBSD: append.c,v 1.18 2009/08/18 18:00:28 dsl Exp $");
+__RCSID("$NetBSD: append.c,v 1.19 2009/08/20 06:36:25 dsl Exp $");
__SCCSID("@(#)append.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@@ -73,13 +73,8 @@
#define OUTPUT { \
if ((n = cpos - ppos) > 1) { \
- for (; ppos < cpos; ++ppos)\
- *ppos -= depth;\
ppos -= n; \
- if (stable_sort) \
- sradixsort(ppos, n, wts1, REC_D); \
- else \
- radixsort(ppos, n, wts1, REC_D); \
+ radix_sort(ppos, n, wts1, REC_D); \
for (; ppos < cpos; ppos++) {\
prec = (const RECHEADER *) (*ppos - REC_DATA_OFFSET);\
put(prec, fp); \
@@ -91,35 +86,36 @@
* copy sorted lines to output; check for uniqueness
*/
void
-append(const u_char **keylist, int nelem, int depth, FILE *fp, put_func_t put,
+append(const u_char **keylist, int nelem, FILE *fp, put_func_t put,
struct field *ftbl)
{
u_char *wts, *wts1;
int n;
- int hdr_off;
const u_char **cpos, **ppos, **lastkey;
const u_char *cend, *pend, *start;
const struct recheader *crec, *prec;
if (*keylist == '\0' && UNIQUE)
return;
+
wts1 = wts = ftbl[0].weights;
- if ((!UNIQUE) && SINGL_FLD) {
- if ((ftbl[0].flags & F) && (ftbl[0].flags & R))
+ if ((!UNIQUE) && SINGL_FLD && ftbl[0].flags & F) {
+ /* Folding case */
+ if (ftbl[0].flags & R)
wts1 = Rascii;
- else if (ftbl[0].flags & F)
+ else
wts1 = ascii;
}
+
lastkey = keylist + nelem;
- hdr_off = REC_DATA_OFFSET + depth;
if (SINGL_FLD && (UNIQUE || wts1 != wts)) {
ppos = keylist;
- prec = (const RECHEADER *) (*ppos - hdr_off);
+ prec = (const RECHEADER *) (*ppos - REC_DATA_OFFSET);
if (UNIQUE)
put(prec, fp);
for (cpos = &keylist[1]; cpos < lastkey; cpos++) {
- crec = (const RECHEADER *) (*cpos - hdr_off);
- if (crec->length == prec->length) {
+ crec = (const RECHEADER *) (*cpos - REC_DATA_OFFSET);
+ if (crec->length == prec->length) {
/*
* Set pend and cend so that trailing NUL and
* record separator is ignored.
@@ -151,10 +147,10 @@
if (!UNIQUE) { OUTPUT; }
} else if (UNIQUE) {
ppos = keylist;
- prec = (const RECHEADER *) (*ppos - hdr_off);
+ prec = (const RECHEADER *) (*ppos - REC_DATA_OFFSET);
put(prec, fp);
for (cpos = &keylist[1]; cpos < lastkey; cpos++) {
- crec = (const RECHEADER *) (*cpos - hdr_off);
+ crec = (const RECHEADER *) (*cpos - REC_DATA_OFFSET);
if (crec->offset == prec->offset) {
/*
* Set pend and cend so that trailing NUL and
@@ -179,7 +175,7 @@
}
}
} else for (cpos = keylist; cpos < lastkey; cpos++) {
- crec = (const RECHEADER *) (*cpos - hdr_off);
+ crec = (const RECHEADER *) (*cpos - REC_DATA_OFFSET);
put(crec, fp);
}
}
Index: src/usr.bin/sort/fields.c
diff -u src/usr.bin/sort/fields.c:1.23 src/usr.bin/sort/fields.c:1.24
--- src/usr.bin/sort/fields.c:1.23 Sat Aug 15 21:26:32 2009
+++ src/usr.bin/sort/fields.c Thu Aug 20 06:36:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fields.c,v 1.23 2009/08/15 21:26:32 dsl Exp $ */
+/* $NetBSD: fields.c,v 1.24 2009/08/20 06:36:25 dsl Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
#include "sort.h"
#ifndef lint
-__RCSID("$NetBSD: fields.c,v 1.23 2009/08/15 21:26:32 dsl Exp $");
+__RCSID("$NetBSD: fields.c,v 1.24 2009/08/20 06:36:25 dsl Exp $");
__SCCSID("@(#)fields.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@@ -97,7 +97,8 @@
* followed by the original line.
*/
length_t
-enterkey(RECHEADER *keybuf, const u_char *keybuf_end, u_char *line_data, size_t line_size, struct field fieldtab
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: uebayasi Date: Thu Aug 20 04:43:34 UTC 2009 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: locore_mips3.S Log Message: Build mips3_ld / mips3_sd for N32/N64. 64-bit arguments are stored in single registers in these ABIs. No special treatment needed. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.93.38.1 src/sys/arch/mips/mips/locore_mips3.S 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/mips/mips/locore_mips3.S diff -u src/sys/arch/mips/mips/locore_mips3.S:1.93 src/sys/arch/mips/mips/locore_mips3.S:1.93.38.1 --- src/sys/arch/mips/mips/locore_mips3.S:1.93 Wed Oct 17 19:55:38 2007 +++ src/sys/arch/mips/mips/locore_mips3.S Thu Aug 20 04:43:34 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_mips3.S,v 1.93 2007/10/17 19:55:38 garbled Exp $ */ +/* $NetBSD: locore_mips3.S,v 1.93.38.1 2009/08/20 04:43:34 uebayasi Exp $ */ /* * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author) @@ -348,11 +348,6 @@ nop END(mips3_cp0_pg_mask_write) -#if defined(_MIPS_BSD_API) && \ -(_MIPS_BSD_API == _MIPS_BSD_API_N32 || _MIPS_BSD_API == _MIPS_BSD_API_LP64) -#error mips3_ld and mips3_sd should be adjusted for N32 or LP64 -#endif - LEAF(mips3_ld) #if !defined(_MIPS_BSD_API) || _MIPS_BSD_API == _MIPS_BSD_API_LP32 mfc0 t0, MIPS_COP_0_STATUS # turn off interrupts @@ -365,6 +360,10 @@ #endif ld v0, 0(a0) +#if defined(_MIPS_BSD_API) && \ +(_MIPS_BSD_API == _MIPS_BSD_API_N32 || _MIPS_BSD_API == _MIPS_BSD_API_LP64) + # nothing to do +#else #if _BYTE_ORDER == _BIG_ENDIAN dsll v1, v0, 32 dsra v1, v1, 32 # low word in v1 @@ -374,6 +373,7 @@ dsll v0, v0, 32 dsra v0, v0, 32 # low word in v0 #endif +#endif #if !defined(_MIPS_BSD_API) || _MIPS_BSD_API == _MIPS_BSD_API_LP32 mtc0 t0, MIPS_COP_0_STATUS # restore intr status. @@ -396,6 +396,10 @@ nop #endif +#if defined(_MIPS_BSD_API) && \ +(_MIPS_BSD_API == _MIPS_BSD_API_N32 || _MIPS_BSD_API == _MIPS_BSD_API_LP64) + # nothing to do +#else # NOTE: a1 is padding! #if _BYTE_ORDER == _BIG_ENDIAN @@ -408,6 +412,7 @@ dsll a3, a3, 32 # high word in a3 #endif or a1, a2, a3 +#endif sd a1, 0(a0) #if !defined(_MIPS_BSD_API) || _MIPS_BSD_API == _MIPS_BSD_API_LP32
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: uebayasi Date: Thu Aug 20 04:36:05 UTC 2009 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: mips_emul.c mips_machdep.c trap.c Log Message: Cast register_t to intptr_t before casting to (void *) because sizeof(register_t) == 64 and sizeof(void *) == 32 in N32 ABI. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.78.1 src/sys/arch/mips/mips/mips_emul.c cvs rdiff -u -r1.205.4.1.2.1 -r1.205.4.1.2.1.2.1 \ src/sys/arch/mips/mips/mips_machdep.c cvs rdiff -u -r1.217 -r1.217.12.1 src/sys/arch/mips/mips/trap.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/mips/mips/mips_emul.c diff -u src/sys/arch/mips/mips/mips_emul.c:1.14 src/sys/arch/mips/mips/mips_emul.c:1.14.78.1 --- src/sys/arch/mips/mips/mips_emul.c:1.14 Sat Aug 26 20:15:28 2006 +++ src/sys/arch/mips/mips/mips_emul.c Thu Aug 20 04:36:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mips_emul.c,v 1.14 2006/08/26 20:15:28 matt Exp $ */ +/* $NetBSD: mips_emul.c,v 1.14.78.1 2009/08/20 04:36:05 uebayasi Exp $ */ /* * Copyright (c) 1999 Shuichiro URATA. All rights reserved. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mips_emul.c,v 1.14 2006/08/26 20:15:28 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mips_emul.c,v 1.14.78.1 2009/08/20 04:36:05 uebayasi Exp $"); #include #include @@ -410,7 +410,7 @@ ksi.ksi_signo = SIGSEGV; ksi.ksi_trap = cause; ksi.ksi_code = SEGV_MAPERR; - ksi.ksi_addr = (void *)frame->f_regs[_R_PC]; + ksi.ksi_addr = (void *)(intptr_t)frame->f_regs[_R_PC]; (*curproc->p_emul->e_trapsignal)(curlwp, &ksi); break; } Index: src/sys/arch/mips/mips/mips_machdep.c diff -u src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1 src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.1 --- src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1 Tue Jun 9 17:48:20 2009 +++ src/sys/arch/mips/mips/mips_machdep.c Thu Aug 20 04:36:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1 2009/06/09 17:48:20 snj Exp $ */ +/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.1 2009/08/20 04:36:05 uebayasi Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -112,7 +112,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1 2009/06/09 17:48:20 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.1 2009/08/20 04:36:05 uebayasi Exp $"); #include "opt_cputype.h" @@ -1750,8 +1750,8 @@ gr[_REG_EPC] = f->f_regs[_R_PC]; gr[_REG_SR]= f->f_regs[_R_SR]; - if ((ras_pc = (__greg_t)ras_lookup(l->l_proc, - (void *) gr[_REG_EPC])) != -1) + if ((ras_pc = (__greg_t)(intptr_t)ras_lookup(l->l_proc, + (void *)(intptr_t)gr[_REG_EPC])) != -1) gr[_REG_EPC] = ras_pc; *flags |= _UC_CPU; Index: src/sys/arch/mips/mips/trap.c diff -u src/sys/arch/mips/mips/trap.c:1.217 src/sys/arch/mips/mips/trap.c:1.217.12.1 --- src/sys/arch/mips/mips/trap.c:1.217 Wed Oct 15 06:51:18 2008 +++ src/sys/arch/mips/mips/trap.c Thu Aug 20 04:36:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.217 2008/10/15 06:51:18 wrstuden Exp $ */ +/* $NetBSD: trap.c,v 1.217.12.1 2009/08/20 04:36:05 uebayasi Exp $ */ /* * Copyright (c) 1992, 1993 @@ -78,7 +78,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217 2008/10/15 06:51:18 wrstuden Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217.12.1 2009/08/20 04:36:05 uebayasi Exp $"); #include "opt_cputype.h" /* which mips CPU levels do we support? */ #include "opt_ddb.h" @@ -563,7 +563,7 @@ ksi.ksi_trap = type & ~T_USER; ksi.ksi_signo = SIGFPE; fp = (struct frame *)l->l_md.md_regs; - ksi.ksi_addr = (void *)fp->f_regs[_R_PC]; + ksi.ksi_addr = (void *)(intptr_t)fp->f_regs[_R_PC]; ksi.ksi_code = FPE_FLTOVF; /* XXX */ break; /* SIGNAL */ }
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 04:22:54 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: syscall.c
Log Message:
#error -> panic() for N32/N64 so that we can build test now.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.12.1 src/sys/arch/mips/mips/syscall.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/mips/mips/syscall.c
diff -u src/sys/arch/mips/mips/syscall.c:1.37 src/sys/arch/mips/mips/syscall.c:1.37.12.1
--- src/sys/arch/mips/mips/syscall.c:1.37 Sat Oct 25 10:41:05 2008
+++ src/sys/arch/mips/mips/syscall.c Thu Aug 20 04:22:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.37 2008/10/25 10:41:05 tsutsui Exp $ */
+/* $NetBSD: syscall.c,v 1.37.12.1 2009/08/20 04:22:54 uebayasi Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37 2008/10/25 10:41:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37.12.1 2009/08/20 04:22:54 uebayasi Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sa.h"
@@ -260,7 +260,7 @@
args[2] = frame->f_regs[_R_A2];
args[3] = frame->f_regs[_R_A3];
#else
-# error syscall not implemented for current MIPS ABI
+ panic("syscall not implemented for current MIPS ABI\n");
#endif
} else {
args = copyargs;
@@ -408,7 +408,7 @@
args[2] = frame->f_regs[_R_A2];
args[3] = frame->f_regs[_R_A3];
#else
-# error syscall not implemented for current MIPS ABI
+ panic("syscall not implemented for current MIPS ABI\n");
#endif
} else {
args = copyargs;
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: uebayasi Date: Thu Aug 20 04:19:15 UTC 2009 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: lock_stubs.S Log Message: Use t8/t9 instead of t6/t7 which are not available in N32/N64. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.18.1 src/sys/arch/mips/mips/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/lock_stubs.S diff -u src/sys/arch/mips/mips/lock_stubs.S:1.9 src/sys/arch/mips/mips/lock_stubs.S:1.9.18.1 --- src/sys/arch/mips/mips/lock_stubs.S:1.9 Mon Apr 28 20:23:28 2008 +++ src/sys/arch/mips/mips/lock_stubs.S Thu Aug 20 04:19:15 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.9 2008/04/28 20:23:28 martin Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.9.18.1 2009/08/20 04:19:15 uebayasi Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -187,11 +187,11 @@ */ LEAF(mutex_spin_enter) lw t2, L_CPU(MIPS_CURLWP) - li t7, -1 - lw t6, CPU_INFO_MTX_COUNT(t2) + li t9, -1 + lw t8, CPU_INFO_MTX_COUNT(t2) lw t1, MTX_IPL(a0) - addu t6, t6, t7 - sw t6, CPU_INFO_MTX_COUNT(t2) + addu t8, t8, t9 + sw t8, CPU_INFO_MTX_COUNT(t2) mfc0 v0, MIPS_COP_0_STATUS and t1, t1, MIPS_INT_MASK nor t1, zero, t1 @@ -199,7 +199,7 @@ DYNAMIC_STATUS_MASK(t1,t0) mtc0 t1, MIPS_COP_0_STATUS COP0_SYNC - bne t6, t7, 1f + bne t8, t9, 1f and v0, v0, (MIPS_INT_MASK | MIPS_SR_INT_IE) sw v0, CPU_INFO_MTX_OLDSPL(t2) 1: @@ -348,11 +348,11 @@ */ LEAF(mutex_spin_enter) lw t2, L_CPU(MIPS_CURLWP) - li t7, -1 - lw t6, CPU_INFO_MTX_COUNT(t2) + li t9, -1 + lw t8, CPU_INFO_MTX_COUNT(t2) lw t1, MTX_IPL(a0) - addu t6, t6, t7 - sw t6, CPU_INFO_MTX_COUNT(t2) + addu t8, t8, t9 + sw t8, CPU_INFO_MTX_COUNT(t2) mfc0 v0, MIPS_COP_0_STATUS and t1, t1, MIPS_INT_MASK nor t1, zero, t1 @@ -360,7 +360,7 @@ DYNAMIC_STATUS_MASK(t1,t0) mtc0 t1, MIPS_COP_0_STATUS COP0_SYNC - bne t6, t7, 1f + bne t8, t9, 1f and v0, v0, (MIPS_INT_MASK | MIPS_SR_INT_IE) sw v0, CPU_INFO_MTX_OLDSPL(t2) 1:
CVS commit: src/share/mk
Module Name:src
Committed By: macallan
Date: Thu Aug 20 03:49:34 UTC 2009
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add suntcx
To generate a diff of this commit:
cvs rdiff -u -r1.568 -r1.569 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.568 src/share/mk/bsd.own.mk:1.569
--- src/share/mk/bsd.own.mk:1.568 Tue Aug 18 14:53:00 2009
+++ src/share/mk/bsd.own.mk Thu Aug 20 03:49:34 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.568 2009/08/18 14:53:00 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.569 2009/08/20 03:49:34 macallan Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -889,8 +889,8 @@
.for _v in \
ag10e apm ark ast ati chips cirrus crime cyrix glint i128 i740 imstt \
intel mach64 mga neomagic newport nsc nv nvxbox pnozz r128 radeonhd \
- rendition s3 s3virge savage siliconmotion sis sunffb suncg6 tdfx tga \
- trident tseng vesa vga via vmware wsfb
+ rendition s3 s3virge savage siliconmotion sis sunffb suncg6 suntcx \
+ tdfx tga trident tseng vesa vga via vmware wsfb
X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist
.endfor
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: cliff Date: Thu Aug 20 03:33:53 UTC 2009 Modified Files: src/sys/arch/mips/mips: genassym.cf Log Message: when USPACE > PAGE_SIZE, we don't have md_upte[] in struct mdlwp To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/mips/mips/genassym.cf 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/mips/mips/genassym.cf diff -u src/sys/arch/mips/mips/genassym.cf:1.45 src/sys/arch/mips/mips/genassym.cf:1.46 --- src/sys/arch/mips/mips/genassym.cf:1.45 Tue Mar 24 21:36:46 2009 +++ src/sys/arch/mips/mips/genassym.cf Thu Aug 20 03:33:53 2009 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.45 2009/03/24 21:36:46 martin Exp $ +# $NetBSD: genassym.cf,v 1.46 2009/08/20 03:33:53 cliff Exp $ # # Copyright (c) 1992, 1993 # The Regents of the University of California. All rights reserved. @@ -100,9 +100,11 @@ # Process status constants define L_CPU offsetof(struct lwp, l_cpu) +if USPACE > PAGE_SIZE define L_MD_REGS offsetof(struct lwp, l_md.md_regs) define L_MD_UPTE_0 offsetof(struct lwp, l_md.md_upte[0]) define L_MD_UPTE_1 offsetof(struct lwp, l_md.md_upte[1]) +endif define L_MD_ASTPENDING offsetof(struct lwp, l_md.md_astpending) define P_RASLIST offsetof(struct proc, p_raslist)
CVS commit: src/sys/dev/wsfb
Module Name:src
Committed By: macallan
Date: Thu Aug 20 02:51:27 UTC 2009
Modified Files:
src/sys/dev/wsfb: genfb.c
Log Message:
call vcons_replay_msgbuf()
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.26 src/sys/dev/wsfb/genfb.c:1.27
--- src/sys/dev/wsfb/genfb.c:1.26 Sat Feb 21 17:24:47 2009
+++ src/sys/dev/wsfb/genfb.c Thu Aug 20 02:51:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.26 2009/02/21 17:24:47 christos Exp $ */
+/* $NetBSD: genfb.c,v 1.27 2009/08/20 02:51:27 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.26 2009/02/21 17:24:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.27 2009/08/20 02:51:27 macallan Exp $");
#include
#include
@@ -211,7 +211,7 @@
(*ri->ri_ops.eraserows)(ri, 0, ri->ri_rows, defattr);
j = 0;
- for (i = 0; i < (1 << sc->sc_depth); i++) {
+ for (i = 0; i < min(1 << sc->sc_depth, 256); i++) {
sc->sc_cmap_red[i] = rasops_cmap[j];
sc->sc_cmap_green[i] = rasops_cmap[j + 1];
@@ -221,6 +221,8 @@
j += 3;
}
+ vcons_replay_msgbuf(&sc->sc_console_screen);
+
if (genfb_softc == NULL)
genfb_softc = sc;
@@ -338,6 +340,7 @@
rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
sc->sc_width / ri->ri_font->fontwidth);
+ /* TODO: actually center output */
ri->ri_hw = scr;
}
@@ -410,9 +413,11 @@
{
int i;
- for (i = 0; i < (1 << sc->sc_depth); i++) {
- genfb_putpalreg(sc, i, sc->sc_cmap_red[i],
- sc->sc_cmap_green[i], sc->sc_cmap_blue[i]);
+ if (sc->sc_depth <= 8) {
+ for (i = 0; i < (1 << sc->sc_depth); i++) {
+ genfb_putpalreg(sc, i, sc->sc_cmap_red[i],
+ sc->sc_cmap_green[i], sc->sc_cmap_blue[i]);
+ }
}
}
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: macallan
Date: Thu Aug 20 02:50:46 UTC 2009
Modified Files:
src/sys/arch/sparc64/dev: ffb.c
Log Message:
call vcons_replay_msgbuf() when appropriate
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 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.36 src/sys/arch/sparc64/dev/ffb.c:1.37
--- src/sys/arch/sparc64/dev/ffb.c:1.36 Sun Nov 16 05:10:46 2008
+++ src/sys/arch/sparc64/dev/ffb.c Thu Aug 20 02:50:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.36 2008/11/16 05:10:46 macallan Exp $ */
+/* $NetBSD: ffb.c,v 1.37 2009/08/20 02:50:46 macallan Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.36 2008/11/16 05:10:46 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.37 2009/08/20 02:50:46 macallan Exp $");
#include
#include
@@ -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: src/sys/dev/sun
Module Name:src
Committed By: macallan
Date: Thu Aug 20 02:49:30 UTC 2009
Modified Files:
src/sys/dev/sun: cgsix.c
Log Message:
call vcons_replay_msgbuf() when appropriate
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 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.44 src/sys/dev/sun/cgsix.c:1.45
--- src/sys/dev/sun/cgsix.c:1.44 Fri Feb 20 22:55:26 2009
+++ src/sys/dev/sun/cgsix.c Thu Aug 20 02:49:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.44 2009/02/20 22:55:26 martin Exp $ */
+/* $NetBSD: cgsix.c,v 1.45 2009/08/20 02:49:30 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.44 2009/02/20 22:55:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.45 2009/08/20 02:49:30 macallan Exp $");
#include
#include
@@ -615,6 +615,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,
@@ -627,7 +630,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
@@ -648,9 +652,6 @@
cgsix_defaultscreen.ncols = ri->ri_cols;
}
}
-
- cg6_setup_palette(sc);
- cgsix_clearscreen(sc);
aa.scrdata = &cgsix_screenlist;
aa.console = isconsole;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Thu Aug 20 02:40:58 UTC 2009
Modified Files:
src/sys/dev/pci: chipsfb.c r128fb.c voodoofb.c voyagerfb.c
Log Message:
use vcons_replay_msgbuf() when appropriate
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/chipsfb.c \
src/sys/dev/pci/voodoofb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/r128fb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/voyagerfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/chipsfb.c
diff -u src/sys/dev/pci/chipsfb.c:1.19 src/sys/dev/pci/chipsfb.c:1.20
--- src/sys/dev/pci/chipsfb.c:1.19 Tue May 12 08:23:00 2009
+++ src/sys/dev/pci/chipsfb.c Thu Aug 20 02:40:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: chipsfb.c,v 1.19 2009/05/12 08:23:00 cegger Exp $ */
+/* $NetBSD: chipsfb.c,v 1.20 2009/08/20 02:40:57 macallan Exp $ */
/*
* Copyright (c) 2006 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.19 2009/05/12 08:23:00 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.20 2009/08/20 02:40:57 macallan Exp $");
#include
#include
@@ -372,6 +372,9 @@
sc->sc_bg = ri->ri_devcmap[bg];
chipsfb_clearscreen(sc);
+ if (console)
+ vcons_replay_msgbuf(&chipsfb_console_screen);
+
aprint_normal_dev(&sc->sc_dev, "%d MB aperture, %d MB VRAM at 0x%08x\n",
(u_int)(sc->sc_fbsize >> 20),
sc->memsize >> 20, (u_int)sc->sc_fb);
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.19 src/sys/dev/pci/voodoofb.c:1.20
--- src/sys/dev/pci/voodoofb.c:1.19 Wed May 6 18:41:54 2009
+++ src/sys/dev/pci/voodoofb.c Thu Aug 20 02:40:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: voodoofb.c,v 1.19 2009/05/06 18:41:54 elad Exp $ */
+/* $NetBSD: voodoofb.c,v 1.20 2009/08/20 02:40:57 macallan Exp $ */
/*
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.19 2009/05/06 18:41:54 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.20 2009/08/20 02:40:57 macallan Exp $");
#include
#include
@@ -451,6 +451,8 @@
sc->sc_bg = ri->ri_devcmap[bg];
voodoofb_clearscreen(sc);
+ if (console)
+ vcons_replay_msgbuf(&voodoofb_console_screen);
aa.console = console;
aa.scrdata = &voodoofb_screenlist;
aa.accessops = &voodoofb_accessops;
Index: src/sys/dev/pci/r128fb.c
diff -u src/sys/dev/pci/r128fb.c:1.8 src/sys/dev/pci/r128fb.c:1.9
--- src/sys/dev/pci/r128fb.c:1.8 Wed May 6 18:41:54 2009
+++ src/sys/dev/pci/r128fb.c Thu Aug 20 02:40:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: r128fb.c,v 1.8 2009/05/06 18:41:54 elad Exp $ */
+/* $NetBSD: r128fb.c,v 1.9 2009/08/20 02:40:57 macallan Exp $ */
/*
* Copyright (c) 2007 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.8 2009/05/06 18:41:54 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.9 2009/08/20 02:40:57 macallan Exp $");
#include
#include
@@ -265,17 +265,31 @@
ri = &sc->sc_console_screen.scr_ri;
+ j = 0;
+ for (i = 0; i < (1 << sc->sc_depth); i++) {
+
+ sc->sc_cmap_red[i] = rasops_cmap[j];
+ sc->sc_cmap_green[i] = rasops_cmap[j + 1];
+ sc->sc_cmap_blue[i] = rasops_cmap[j + 2];
+ r128fb_putpalreg(sc, i, rasops_cmap[j], rasops_cmap[j + 1],
+ rasops_cmap[j + 2]);
+ j += 3;
+ }
+
if (is_console) {
vcons_init_screen(&sc->vd, &sc->sc_console_screen, 1,
&defattr);
sc->sc_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
+ r128fb_rectfill(sc, 0, 0, sc->sc_width, sc->sc_height,
+ ri->ri_devcmap[(defattr >> 16) & 0xff]);
sc->sc_defaultscreen_descr.textops = &ri->ri_ops;
sc->sc_defaultscreen_descr.capabilities = ri->ri_caps;
sc->sc_defaultscreen_descr.nrows = ri->ri_rows;
sc->sc_defaultscreen_descr.ncols = ri->ri_cols;
wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, 0,
defattr);
+ vcons_replay_msgbuf(&sc->sc_console_screen);
} else {
/*
* since we're not the console we can postpone the rest
@@ -284,20 +298,6 @@
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
}
- j = 0;
- for (i = 0; i < (1 << sc->sc_depth); i++) {
-
- sc->sc_cmap_red[i] = rasops_cmap[j];
- sc->sc_cmap_green[i] = rasops_cmap[j + 1];
- sc->sc_cmap_blue[i] = rasops_cmap[j + 2];
- r128fb_putpalreg(sc, i, rasops_cmap[j], rasops_cmap[j + 1],
- rasops_cmap[j + 2]);
- j += 3;
- }
-
- r128fb_rectfill(sc, 0, 0, sc->sc_width, sc->sc_height,
- ri->ri_devcmap[(defattr >> 16) & 0xff]);
-
aa.console = is_console;
aa.scrdata = &sc->sc_screenlist;
aa.accessops = &r128fb_accessops;
Index: src/sys/dev/pci/voyagerfb.c
diff -u src/sys/dev/pci/voyagerfb.c:1.1 src/sys/dev/pci/voyagerfb.c:1.2
--- src/sys/dev/pci/voyagerfb.c:1.1 Wed Aug 12 19:28:00 2009
+++ src/sys/dev/pci/voyagerfb.c Thu Aug 20 02:40:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: voyagerfb.c,v 1.1 2009/08/12 19:28:00 macallan Exp $ */
+/* $NetBSD: voyagerfb.c,
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Thu Aug 20 02:29:17 UTC 2009
Modified Files:
src/sys/dev/sbus: agten.c p9100.c tcx.c
Log Message:
call vcons_replay_msgbuf() if we're the console
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/sbus/agten.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/sbus/p9100.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/sbus/tcx.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/sbus/agten.c
diff -u src/sys/dev/sbus/agten.c:1.19 src/sys/dev/sbus/agten.c:1.20
--- src/sys/dev/sbus/agten.c:1.19 Tue May 26 03:32:51 2009
+++ src/sys/dev/sbus/agten.c Thu Aug 20 02:29:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: agten.c,v 1.19 2009/05/26 03:32:51 macallan Exp $ */
+/* $NetBSD: agten.c,v 1.20 2009/08/20 02:29:16 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.19 2009/05/26 03:32:51 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.20 2009/08/20 02:29:16 macallan Exp $");
/*
* a driver for the Fujitsu AG-10e SBus framebuffer
@@ -314,6 +314,7 @@
i128_rectfill(sc->sc_bustag, sc->sc_i128_regh, 0, 0,
sc->sc_width, sc->sc_height,
ri->ri_devcmap[(defattr >> 16) & 0xff]);
+ vcons_replay_msgbuf(&sc->sc_console_screen);
} else {
/*
* since we're not the console we can postpone the rest
Index: src/sys/dev/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.46 src/sys/dev/sbus/p9100.c:1.47
--- src/sys/dev/sbus/p9100.c:1.46 Wed Jun 3 16:25:22 2009
+++ src/sys/dev/sbus/p9100.c Thu Aug 20 02:29:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.46 2009/06/03 16:25:22 macallan Exp $ */
+/* $NetBSD: p9100.c,v 1.47 2009/08/20 02:29:16 macallan Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.46 2009/06/03 16:25:22 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.47 2009/08/20 02:29:16 macallan Exp $");
#include
#include
@@ -460,6 +460,7 @@
if(isconsole) {
wsdisplay_cnattach(&p9100_defscreendesc, ri, 0, 0, defattr);
+ vcons_replay_msgbuf(&p9100_console_screen);
}
aa.console = isconsole;
@@ -1083,7 +1084,7 @@
int fg, bg, uc, i;
uint8_t *data;
- int x, y, wi,he;
+ int x, y, wi, he;
wi = ri->ri_font->fontwidth;
he = ri->ri_font->fontheight;
Index: src/sys/dev/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.38 src/sys/dev/sbus/tcx.c:1.39
--- src/sys/dev/sbus/tcx.c:1.38 Thu Aug 20 02:01:55 2009
+++ src/sys/dev/sbus/tcx.c Thu Aug 20 02:29:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.38 2009/08/20 02:01:55 macallan Exp $ */
+/* $NetBSD: tcx.c,v 1.39 2009/08/20 02:29:16 macallan Exp $ */
/*
* Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.38 2009/08/20 02:01:55 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.39 2009/08/20 02:29:16 macallan Exp $");
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -401,10 +401,9 @@
if(isconsole) {
wsdisplay_cnattach(&tcx_defscreendesc, ri, 0, 0, defattr);
+ vcons_replay_msgbuf(&tcx_console_screen);
}
- vcons_replay_msgbuf(&tcx_console_screen);
-
aa.console = isconsole;
aa.scrdata = &tcx_screenlist;
aa.accessops = &tcx_accessops;
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Thu Aug 20 02:01:55 UTC 2009
Modified Files:
src/sys/dev/sbus: tcx.c
Log Message:
use vcons_replay_msgbuf()
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/sbus/tcx.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/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.37 src/sys/dev/sbus/tcx.c:1.38
--- src/sys/dev/sbus/tcx.c:1.37 Thu Aug 20 00:59:28 2009
+++ src/sys/dev/sbus/tcx.c Thu Aug 20 02:01:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.37 2009/08/20 00:59:28 macallan Exp $ */
+/* $NetBSD: tcx.c,v 1.38 2009/08/20 02:01:55 macallan Exp $ */
/*
* Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.37 2009/08/20 00:59:28 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.38 2009/08/20 02:01:55 macallan Exp $");
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -403,6 +403,8 @@
wsdisplay_cnattach(&tcx_defscreendesc, ri, 0, 0, defattr);
}
+ vcons_replay_msgbuf(&tcx_console_screen);
+
aa.console = isconsole;
aa.scrdata = &tcx_screenlist;
aa.accessops = &tcx_accessops;
@@ -1079,6 +1081,10 @@
}
if (cur->which & WSDISPLAY_CURSOR_DOCMAP) {
#if 0
+ /*
+ * apparently we're not writing in the right register here - if we do
+ * this the screen goes all funky
+ */
int i;
for (i = 0; i < cur->cmap.count; i++) {
@@ -1094,7 +1100,6 @@
#endif
}
if (cur->which & WSDISPLAY_CURSOR_DOSHAPE) {
-#if 1
int i;
uint32_t temp, poof;
@@ -1125,7 +1130,6 @@
THC_CURSOR_0 + i, poof);
}
}
-#endif
return 0;
}
CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: macallan
Date: Thu Aug 20 02:01:08 UTC 2009
Modified Files:
src/sys/dev/wscons: files.wscons wsdisplay_vconsvar.h
Added Files:
src/sys/dev/wscons: wsdisplay_vcons_util.c
Log Message:
add vcons_replay_msgbuf() for use by wsdisplay drivers to replay the message
buffer when attaching so older log messages will show up in the scrollback
buffer
Idea from gimpy
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/wscons/files.wscons
cvs rdiff -u -r0 -r1.1 src/sys/dev/wscons/wsdisplay_vcons_util.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/wscons/wsdisplay_vconsvar.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/wscons/files.wscons
diff -u src/sys/dev/wscons/files.wscons:1.40 src/sys/dev/wscons/files.wscons:1.41
--- src/sys/dev/wscons/files.wscons:1.40 Mon Aug 6 03:11:32 2007
+++ src/sys/dev/wscons/files.wscons Thu Aug 20 02:01:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.wscons,v 1.40 2007/08/06 03:11:32 macallan Exp $
+# $NetBSD: files.wscons,v 1.41 2009/08/20 02:01:08 macallan Exp $
#
# "Workstation Console" glue; attaches frame buffer to emulator & keyboard,
@@ -74,4 +74,5 @@
# generic virtual console support on bitmapped framebuffers
file dev/wscons/wsdisplay_vcons.c vcons
+file dev/wscons/wsdisplay_vcons_util.c vcons
defflag opt_vcons.h VCONS_SWITCH_ASYNC
Index: src/sys/dev/wscons/wsdisplay_vconsvar.h
diff -u src/sys/dev/wscons/wsdisplay_vconsvar.h:1.9 src/sys/dev/wscons/wsdisplay_vconsvar.h:1.10
--- src/sys/dev/wscons/wsdisplay_vconsvar.h:1.9 Mon Apr 28 20:24:01 2008
+++ src/sys/dev/wscons/wsdisplay_vconsvar.h Thu Aug 20 02:01:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vconsvar.h,v 1.9 2008/04/28 20:24:01 martin Exp $ */
+/* $NetBSD: wsdisplay_vconsvar.h,v 1.10 2009/08/20 02:01:08 macallan Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -124,6 +124,6 @@
void vcons_redraw_screen(struct vcons_screen *);
-
+void vcons_replay_msgbuf(struct vcons_screen *);
#endif /* _WSDISPLAY_VCONS_H_ */
Added files:
Index: src/sys/dev/wscons/wsdisplay_vcons_util.c
diff -u /dev/null src/sys/dev/wscons/wsdisplay_vcons_util.c:1.1
--- /dev/null Thu Aug 20 02:01:08 2009
+++ src/sys/dev/wscons/wsdisplay_vcons_util.c Thu Aug 20 02:01:08 2009
@@ -0,0 +1,60 @@
+/* $NetBSD: wsdisplay_vcons_util.c,v 1.1 2009/08/20 02:01:08 macallan Exp $ */
+
+/*-
+ * Copyright (c) 2005, 2006 Michael Lorenz
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* some utility functions for use with vcons */
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+
+void
+vcons_replay_msgbuf(struct vcons_screen *scr)
+{
+ int status = scr->scr_status;
+ int rptr = msgbufp->msg_bufr;
+
+ scr->scr_status &= ~VCONS_IS_VISIBLE;
+ while (rptr != msgbufp->msg_bufx) {
+ cnputc(msgbufp->msg_bufc[rptr]);
+ rptr++;
+ if (rptr >= msgbufp->msg_bufs)
+ rptr = 0;
+ }
+ scr->scr_status = status;
+ vcons_redraw_screen(scr);
+}
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: cliff Date: Thu Aug 20 01:33:39 UTC 2009 Modified Files: src/sys/arch/mips/include: proc.h Log Message: include mips/vmparam.h to get PAGE_SIZE To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/include/proc.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/mips/include/proc.h diff -u src/sys/arch/mips/include/proc.h:1.22 src/sys/arch/mips/include/proc.h:1.23 --- src/sys/arch/mips/include/proc.h:1.22 Mon Aug 17 18:56:09 2009 +++ src/sys/arch/mips/include/proc.h Thu Aug 20 01:33:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: proc.h,v 1.22 2009/08/17 18:56:09 matt Exp $ */ +/* $NetBSD: proc.h,v 1.23 2009/08/20 01:33:39 cliff Exp $ */ /* * Copyright (c) 1992, 1993 @@ -38,6 +38,7 @@ #define _MIPS_PROC_H_ #include +#include struct lwp;
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: cliff
Date: Thu Aug 20 01:33:04 UTC 2009
Modified Files:
src/sys/arch/mips/mips: vm_machdep.c
Log Message:
if USPACE <= PAGE_SIZE then the (single) upage will be mapped in kseg0 or xphys
and cpu_swapin is null func.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/mips/mips/vm_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/mips/mips/vm_machdep.c
diff -u src/sys/arch/mips/mips/vm_machdep.c:1.124 src/sys/arch/mips/mips/vm_machdep.c:1.125
--- src/sys/arch/mips/mips/vm_machdep.c:1.124 Mon Aug 17 18:56:10 2009
+++ src/sys/arch/mips/mips/vm_machdep.c Thu Aug 20 01:33:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.124 2009/08/17 18:56:10 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.125 2009/08/20 01:33:04 cliff Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
*/
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.124 2009/08/17 18:56:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.125 2009/08/20 01:33:04 cliff Exp $");
#include "opt_ddb.h"
@@ -215,6 +215,7 @@
void
cpu_swapin(struct lwp *l)
{
+#if USPACE > PAGE_SIZE
pt_entry_t *pte;
int i, x;
@@ -229,6 +230,7 @@
pte = kvtopte(l->l_addr);
for (i = 0; i < UPAGES; i++)
l->l_md.md_upte[i] = pte[i].pt_entry &~ x;
+#endif
}
void
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Thu Aug 20 00:59:28 UTC 2009
Modified Files:
src/sys/dev/sbus: tcx.c
Log Message:
add support for a hardware cursor via wsdisplay
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/sbus/tcx.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/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.36 src/sys/dev/sbus/tcx.c:1.37
--- src/sys/dev/sbus/tcx.c:1.36 Wed Aug 19 20:51:47 2009
+++ src/sys/dev/sbus/tcx.c Thu Aug 20 00:59:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.36 2009/08/19 20:51:47 macallan Exp $ */
+/* $NetBSD: tcx.c,v 1.37 2009/08/20 00:59:28 macallan Exp $ */
/*
* Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.36 2009/08/19 20:51:47 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.37 2009/08/20 00:59:28 macallan Exp $");
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -101,6 +101,8 @@
u_char sc_cmap_green[256];
u_char sc_cmap_blue[256];
int sc_mode, sc_bg;
+ int sc_cursor_x, sc_cursor_y;
+ int sc_hotspot_x, sc_hotspot_y;
struct vcons_data vd;
};
@@ -179,6 +181,8 @@
static void tcx_eraserows(void *, int, int, long);
static void tcx_putchar(void *, int, int, u_int, long);
static void tcx_set_video(struct tcx_softc *, int);
+static int tcx_do_cursor(struct tcx_softc *, struct wsdisplay_cursor *);
+static void tcx_set_cursor(struct tcx_softc *);
struct wsdisplay_accessops tcx_accessops = {
tcx_ioctl,
@@ -238,6 +242,11 @@
sc->sc_bustag = sa->sa_bustag;
node = sa->sa_node;
+ sc->sc_cursor_x = 0x7fff;
+ sc->sc_cursor_y = 0x7fff;
+ sc->sc_hotspot_x = 0;
+ sc->sc_hotspot_y = 0;
+
fb->fb_driver = &tcx_fbdriver;
fb->fb_device = sc->sc_dev;
/* Mask out invalid flags from the user. */
@@ -357,6 +366,7 @@
}
tcx_loadcmap(sc, 0, 256);
+ tcx_set_cursor(sc);
/* enable video */
confreg = bus_space_read_4(sa->sa_bustag, sc->sc_thc, THC_MISC);
confreg |= THC_MISC_VIDEN;
@@ -495,11 +505,11 @@
static void
tcx_reset(struct tcx_softc *sc)
{
+ uint32_t reg;
- /* Disable cursor in Brooktree DAC. */
- bus_space_write_4(sc->sc_bustag, sc->sc_bt, DAC_ADDRESS,
- DAC_C1_CONTROL_0);
- bus_space_write_4(sc->sc_bustag, sc->sc_bt, DAC_CONTROL_1, 0);
+ reg = bus_space_read_4(sc->sc_bustag, sc->sc_thc, THC_MISC);
+ reg |= THC_MISC_CURSRES;
+ bus_space_write_4(sc->sc_bustag, sc->sc_thc, THC_MISC, reg);
}
static void
@@ -729,6 +739,40 @@
tcx_clearscreen(sc, 3);
}
}
+ case WSDISPLAYIO_GCURPOS:
+ {
+struct wsdisplay_curpos *cp = (void *)data;
+
+cp->x = sc->sc_cursor_x;
+cp->y = sc->sc_cursor_y;
+ }
+ return 0;
+
+ case WSDISPLAYIO_SCURPOS:
+ {
+struct wsdisplay_curpos *cp = (void *)data;
+
+sc->sc_cursor_x = cp->x;
+sc->sc_cursor_y = cp->y;
+tcx_set_cursor(sc);
+ }
+ return 0;
+
+ case WSDISPLAYIO_GCURMAX:
+ {
+struct wsdisplay_curpos *cp = (void *)data;
+
+cp->x = 32;
+cp->y = 32;
+ }
+ return 0;
+
+ case WSDISPLAYIO_SCURSOR:
+ {
+struct wsdisplay_cursor *cursor = (void *)data;
+
+return tcx_do_cursor(sc, cursor);
+ }
}
return EPASSTHROUGH;
}
@@ -1008,3 +1052,90 @@
}
}
+static int
+tcx_do_cursor(struct tcx_softc *sc, struct wsdisplay_cursor *cur)
+{
+ if (cur->which & WSDISPLAY_CURSOR_DOCUR) {
+
+ if (cur->enable) {
+ tcx_set_cursor(sc);
+ } else {
+ /* move the cursor out of sight */
+ bus_space_write_4(sc->sc_bustag, sc->sc_thc,
+ THC_CURSOR_POS, 0x7fff7fff);
+ }
+ }
+ if (cur->which & WSDISPLAY_CURSOR_DOHOT) {
+
+ sc->sc_hotspot_x = cur->hot.x;
+ sc->sc_hotspot_y = cur->hot.y;
+ tcx_set_cursor(sc);
+ }
+ if (cur->which & WSDISPLAY_CURSOR_DOPOS) {
+
+ sc->sc_cursor_x = cur->pos.x;
+ sc->sc_cursor_y = cur->pos.y;
+ tcx_set_cursor(sc);
+ }
+ if (cur->which & WSDISPLAY_CURSOR_DOCMAP) {
+#if 0
+ int i;
+
+ for (i = 0; i < cur->cmap.count; i++) {
+ bus_space_write_4(sc->sc_bustag, sc->sc_bt, DAC_ADDRESS,
+ (cur->cmap.index + i + 2) << 24);
+ bus_space_write_4(sc->sc_bustag, sc->sc_bt,
+ DAC_CURSOR_LUT, cur->cmap.red[i] << 24);
+ bus_space_write_4(sc->sc_bustag, sc->sc_bt,
+ DAC_CURSOR_LUT, cur->cmap.green[i] << 24);
+ bus_space_write_4(sc->sc_bustag, sc->sc_bt,
+ DAC_CURSOR_LUT, cur->cmap.blue[i] << 24);
+ }
+#endif
+ }
+ if (cur->which & WSDISPLAY_CURSOR_DOSHAPE) {
+#if 1
+ int i;
+ uint32_t temp, poof;
+
+ for (i = 0; i < 128; i += 4) {
+ memcpy(&temp, &cur->mask[i], 4);
+ printf("%08x -> ", temp);
+ poof = ((temp & 0x80808080) >> 7) |
+ ((temp & 0x40404040) >> 5) |
+ ((temp & 0x20202020) >> 3) |
+ ((temp & 0x10101010) >> 1) |
+ ((temp & 0x08080808) << 1) |
+ ((temp & 0x04040404) << 3) |
+ ((temp & 0x02020202) << 5) |
+ ((temp & 0x0101010
CVS commit: src/sys
Module Name:src Committed By: thorpej Date: Wed Aug 19 23:54:34 UTC 2009 Modified Files: src/sys/arch/arm/include/arm32: pmap.h src/sys/uvm: uvm_pmap.h Log Message: Use PMAP_ENABLE_PMAP_KMPAGE to enable PMAP_KMPAGE. We still want the bit defined in the MI space, not in an MD header. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/arm/include/arm32/pmap.h cvs rdiff -u -r1.29 -r1.30 src/sys/uvm/uvm_pmap.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/arm/include/arm32/pmap.h diff -u src/sys/arch/arm/include/arm32/pmap.h:1.91 src/sys/arch/arm/include/arm32/pmap.h:1.92 --- src/sys/arch/arm/include/arm32/pmap.h:1.91 Wed Aug 19 14:58:48 2009 +++ src/sys/arch/arm/include/arm32/pmap.h Wed Aug 19 23:54:33 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.91 2009/08/19 14:58:48 thorpej Exp $ */ +/* $NetBSD: pmap.h,v 1.92 2009/08/19 23:54:33 thorpej Exp $ */ /* * Copyright (c) 2002, 2003 Wasabi Systems, Inc. @@ -290,6 +290,7 @@ #define PMAP_NEED_PROCWR #define PMAP_GROWKERNEL /* turn on pmap_growkernel interface */ +#define PMAP_ENABLE_PMAP_KMPAGE /* enable the PMAP_KMPAGE flag */ #if ARM_MMU_V6 > 0 #define PMAP_PREFER(hint, vap, sz, td) pmap_prefer((hint), (vap), (td)) Index: src/sys/uvm/uvm_pmap.h diff -u src/sys/uvm/uvm_pmap.h:1.29 src/sys/uvm/uvm_pmap.h:1.30 --- src/sys/uvm/uvm_pmap.h:1.29 Wed Aug 19 14:58:48 2009 +++ src/sys/uvm/uvm_pmap.h Wed Aug 19 23:54:33 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_pmap.h,v 1.29 2009/08/19 14:58:48 thorpej Exp $ */ +/* $NetBSD: uvm_pmap.h,v 1.30 2009/08/19 23:54:33 thorpej Exp $ */ /* * Copyright (c) 1991, 1993 @@ -103,7 +103,11 @@ */ #define PMAP_WIRED 0x0010 /* wired mapping */ #define PMAP_CANFAIL 0x0020 /* can fail if resource shortage */ +#if defined(PMAP_ENABLE_PMAP_KMPAGE) #define PMAP_KMPAGE 0x0040 /* [PA] page used for kernel memory */ +#else +#define PMAP_KMPAGE 0x +#endif /* PMAP_ENABLE_PMAP_KMPAGE */ #define PMAP_MD_MASK 0xff00 /* Machine-dependent bits */
CVS commit: src/sys/arch/atari/atari
Module Name:src Committed By: he Date: Wed Aug 19 23:46:52 UTC 2009 Modified Files: src/sys/arch/atari/atari: machdep.c Log Message: Another needing . To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/arch/atari/atari/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/atari/atari/machdep.c diff -u src/sys/arch/atari/atari/machdep.c:1.160 src/sys/arch/atari/atari/machdep.c:1.161 --- src/sys/arch/atari/atari/machdep.c:1.160 Thu Mar 5 13:42:59 2009 +++ src/sys/arch/atari/atari/machdep.c Wed Aug 19 23:46:52 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.160 2009/03/05 13:42:59 tsutsui Exp $ */ +/* $NetBSD: machdep.c,v 1.161 2009/08/19 23:46:52 he Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.160 2009/03/05 13:42:59 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.161 2009/08/19 23:46:52 he Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" @@ -106,6 +106,7 @@ #include #include #include +#include #include #if defined(DDB) && defined(__ELF__) #include
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Wed Aug 19 23:17:25 UTC 2009 Modified Files: src/share/man/man4: ppbus.4 Log Message: New sentence, new line. Whitespace nit. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/ppbus.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ppbus.4 diff -u src/share/man/man4/ppbus.4:1.14 src/share/man/man4/ppbus.4:1.15 --- src/share/man/man4/ppbus.4:1.14 Wed Aug 19 20:45:23 2009 +++ src/share/man/man4/ppbus.4 Wed Aug 19 23:17:25 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: ppbus.4,v 1.14 2009/08/19 20:45:23 mbalmer Exp $ +.\" $NetBSD: ppbus.4,v 1.15 2009/08/19 23:17:25 wiz Exp $ .\" .\" Copyright (c) 1998, 1999 Nicolas Souchu .\" All rights reserved. @@ -403,15 +403,17 @@ .Ss GPIO interface Pins 1 through 17 of the parallel port can be controlled through the .Xr gpio 4 -interface, pins 18 through 25 are hardwired to ground. Pins 10 through -13 and pin 15 are input pins, the others are output pins. Some of the -pins are inverted by the hardware, the values read or written are -adjusted accordingly. Note that the +interface, pins 18 through 25 are hardwired to ground. +Pins 10 through 13 and pin 15 are input pins, the others are output +pins. +Some of the pins are inverted by the hardware, the values read or +written are adjusted accordingly. +Note that the .Xr gpio 4 interface starts at 0 when numbering pins. .Sh SEE ALSO .Xr atppc 4 , -.Xr gpio 4, +.Xr gpio 4 , .Xr lpt 4 , .Xr plip 4 , .Xr ppi 4 ,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: dyoung Date: Wed Aug 19 21:36:47 UTC 2009 Modified Files: src/sys/dev/pci: pci.c Log Message: Since the intention in capturing a device's PCI Configuration Space in pci_probe_device() is for pcidevdetached() to restore the device's original PCI Configuration Space after it is detached, let's capture a device's PCI configuration before attaching a driver to it instead of after. Capturing the configuration after attaching is too late, because a driver such as ath(4) may put a device to sleep promptly after attaching it, and putting a PCI device to sleep often entails changing PCI configuration from defaults. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/sys/dev/pci/pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pci.c diff -u src/sys/dev/pci/pci.c:1.123 src/sys/dev/pci/pci.c:1.124 --- src/sys/dev/pci/pci.c:1.123 Sat Jul 4 21:01:10 2009 +++ src/sys/dev/pci/pci.c Wed Aug 19 21:36:47 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pci.c,v 1.123 2009/07/04 21:01:10 cegger Exp $ */ +/* $NetBSD: pci.c,v 1.124 2009/08/19 21:36:47 dyoung Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.123 2009/07/04 21:01:10 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.124 2009/08/19 21:36:47 dyoung Exp $"); #include "opt_pci.h" @@ -276,7 +276,6 @@ pcireg_t id, csr, class, intr, bhlcr; int ret, pin, bus, device, function; int locs[PCICF_NLOCS]; - device_t subdev; pci_decompose_tag(pc, tag, &bus, &device, &function); @@ -363,17 +362,17 @@ locs[PCICF_DEV] = device; locs[PCICF_FUNCTION] = function; - subdev = config_found_sm_loc(sc->sc_dev, "pci", locs, &pa, - pciprint, config_stdsubmatch); - c = &sc->PCI_SC_DEVICESC(device, function); - c->c_dev = subdev; pci_conf_capture(pc, tag, &c->c_conf); if (pci_get_powerstate(pc, tag, &c->c_powerstate) == 0) c->c_psok = true; else c->c_psok = false; - ret = (subdev != NULL); + + c->c_dev = config_found_sm_loc(sc->sc_dev, "pci", locs, &pa, + pciprint, config_stdsubmatch); + + ret = (c->c_dev != NULL); } return ret;
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Wed Aug 19 20:51:47 UTC 2009
Modified Files:
src/sys/dev/sbus: tcx.c
Log Message:
clear the screen and initialize it with the right WID to bypass the LUT on
24bit boards when switching to WSDISPLAYIO_MODE_FB
Now 24bit X with wsfb looks right.
TODO:
- hardware cursor
- acceleration
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sbus/tcx.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/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.35 src/sys/dev/sbus/tcx.c:1.36
--- src/sys/dev/sbus/tcx.c:1.35 Wed Aug 19 03:45:51 2009
+++ src/sys/dev/sbus/tcx.c Wed Aug 19 20:51:47 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: tcx.c,v 1.35 2009/08/19 03:45:51 macallan Exp $ */
+/* $NetBSD: tcx.c,v 1.36 2009/08/19 20:51:47 macallan Exp $ */
/*
- * Copyright (c) 1996,1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.35 2009/08/19 03:45:51 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.36 2009/08/19 20:51:47 macallan Exp $");
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -174,7 +174,7 @@
static paddr_t tcx_mmap(void *, void *, off_t, int);
static void tcx_init_screen(void *, struct vcons_screen *, int, long *);
-static void tcx_clearscreen(struct tcx_softc *);
+static void tcx_clearscreen(struct tcx_softc *, int);
static void tcx_copyrows(void *, int, int, int);
static void tcx_eraserows(void *, int, int, long);
static void tcx_putchar(void *, int, int, u_int, long);
@@ -380,7 +380,7 @@
tcx_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
sc->sc_bg = (defattr >> 16) & 0xff;
- tcx_clearscreen(sc);
+ tcx_clearscreen(sc, 0);
ri = &tcx_console_screen.scr_ri;
@@ -502,9 +502,6 @@
bus_space_write_4(sc->sc_bustag, sc->sc_bt, DAC_CONTROL_1, 0);
}
-/*
- * Load a subset of the current (new) colormap into the color DAC.
- */
static void
tcx_loadcmap(struct tcx_softc *sc, int start, int ncolors)
{
@@ -726,9 +723,10 @@
if (new_mode == WSDISPLAYIO_MODE_EMUL)
{
tcx_loadcmap(sc, 0, 256);
- tcx_clearscreen(sc);
+ tcx_clearscreen(sc, 0);
vcons_redraw_screen(ms);
- }
+ } else if (!sc->sc_8bit)
+ tcx_clearscreen(sc, 3);
}
}
}
@@ -792,13 +790,17 @@
}
static void
-tcx_clearscreen(struct tcx_softc *sc)
+tcx_clearscreen(struct tcx_softc *sc, int spc)
{
uint64_t bg = ((uint64_t)sc->sc_bg << 32) | 0xLL;
+ uint64_t spc64;
int i;
+ spc64 = spc & 3;
+ spc64 = spc64 << 56;
+
for (i = 0; i < 1024 * 1024; i += 32)
- sc->sc_rstip[i] = bg;
+ sc->sc_rstip[i] = bg | spc64;
}
static void
CVS commit: src/share/man/man4
Module Name:src Committed By: mbalmer Date: Wed Aug 19 20:45:23 UTC 2009 Modified Files: src/share/man/man4: ppbus.4 Log Message: Mention GPIO in the header so that apropos gpio will list this man page. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/ppbus.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ppbus.4 diff -u src/share/man/man4/ppbus.4:1.13 src/share/man/man4/ppbus.4:1.14 --- src/share/man/man4/ppbus.4:1.13 Tue Apr 29 14:07:36 2008 +++ src/share/man/man4/ppbus.4 Wed Aug 19 20:45:23 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: ppbus.4,v 1.13 2008/04/29 14:07:36 cegger Exp $ +.\" $NetBSD: ppbus.4,v 1.14 2009/08/19 20:45:23 mbalmer Exp $ .\" .\" Copyright (c) 1998, 1999 Nicolas Souchu .\" All rights reserved. @@ -26,12 +26,12 @@ .\" .\" $FreeBSD: src/share/man/man4/ppbus.4,v 1.14.2.5 2001/08/17 13:08:39 ru Exp $ .\" -.Dd December 25, 2005 +.Dd August 19, 2009 .Dt PPBUS 4 .Os .Sh NAME .Nm ppbus -.Nd Parallel Port Bus system +.Nd Parallel Port Bus system with GPIO .Sh SYNOPSIS .Cd "ppbus* at atppc?" .Cd "options PPBUS_VERBOSE"
CVS commit: src/gnu/usr.bin
Module Name:src
Committed By: asau
Date: Wed Aug 19 20:32:59 UTC 2009
Modified Files:
src/gnu/usr.bin/c89: Makefile
src/gnu/usr.bin/c99: Makefile
Log Message:
Use SCRIPTS instead of FILES to handle (executable) scripts.
Approved by dholland.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/gnu/usr.bin/c89/Makefile
cvs rdiff -u -r1.1 -r1.2 src/gnu/usr.bin/c99/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/c89/Makefile
diff -u src/gnu/usr.bin/c89/Makefile:1.1 src/gnu/usr.bin/c89/Makefile:1.2
--- src/gnu/usr.bin/c89/Makefile:1.1 Sun Aug 19 14:21:03 2001
+++ src/gnu/usr.bin/c89/Makefile Wed Aug 19 20:32:58 2009
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2001/08/19 14:21:03 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/19 20:32:58 asau Exp $
-FILES= c89.sh
-FILESNAME= c89
-FILESDIR= /usr/bin
-FILESMODE= ${BINMODE}
+SCRIPTS= c89.sh
+SCRIPTSDIR=/usr/bin
MAN= c89.1
Index: src/gnu/usr.bin/c99/Makefile
diff -u src/gnu/usr.bin/c99/Makefile:1.1 src/gnu/usr.bin/c99/Makefile:1.2
--- src/gnu/usr.bin/c99/Makefile:1.1 Tue Sep 23 23:59:04 2008
+++ src/gnu/usr.bin/c99/Makefile Wed Aug 19 20:32:58 2009
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2008/09/23 23:59:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/19 20:32:58 asau Exp $
-FILES= c99.sh
-FILESNAME= c99
-FILESDIR= /usr/bin
-FILESMODE= ${BINMODE}
+SCRIPTS= c99.sh
+SCRIPTSDIR=/usr/bin
MAN= c99.1
CVS commit: src/sys/arch/atari/atari
Module Name:src Committed By: he Date: Wed Aug 19 19:39:05 UTC 2009 Modified Files: src/sys/arch/atari/atari: atari_init.c Log Message: One more file needing . To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/sys/arch/atari/atari/atari_init.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/atari/atari/atari_init.c diff -u src/sys/arch/atari/atari/atari_init.c:1.83 src/sys/arch/atari/atari/atari_init.c:1.84 --- src/sys/arch/atari/atari/atari_init.c:1.83 Wed Jul 8 12:23:09 2009 +++ src/sys/arch/atari/atari/atari_init.c Wed Aug 19 19:39:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: atari_init.c,v 1.83 2009/07/08 12:23:09 tsutsui Exp $ */ +/* $NetBSD: atari_init.c,v 1.84 2009/08/19 19:39:05 he Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.83 2009/07/08 12:23:09 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.84 2009/08/19 19:39:05 he Exp $"); #include "opt_ddb.h" #include "opt_mbtype.h" @@ -55,6 +55,7 @@ #include #include #include +#include #include #include
CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src
Module Name:xsrc Committed By: martin Date: Wed Aug 19 18:57:25 UTC 2009 Modified Files: xsrc/external/mit/xf86-input-mouse/dist/src: mouse.c Log Message: Fix my favourite mouse handling bug for the Nth time: with a multiplexed device like wsmouse it does not make sense to kill emulate3buttons on first button-3-pressed event. The button-3 pressed may belong to a mouse long gone and leave the internal (two button only) mousepad useless. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.8 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.9 --- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.8 Tue Aug 18 05:34:17 2009 +++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c Wed Aug 19 18:57:25 2009 @@ -2062,6 +2062,19 @@ if (!pMse->emulate3ButtonsSoft) return TRUE; +#if defined(__NetBSD__) && defined(WSCONS_SUPPORT) + /* +* - check for pMse->protocolID being wsmouse? Why doesn't it +* have it's own ID? +* On NetBSD a wsmouse is a multiplexed device. Imagine a notebook +* with two-button mousepad, and an external USB mouse plugged in +* temporarily. After using button 3 on the external mouse and +* unplugging it again, the mousepad will still need to emulate +* 3 buttons. +*/ + return TRUE; +#endif + pMse->emulate3Buttons = FALSE; if (pMse->emulate3Pending)
CVS commit: src/sys/netinet6
Module Name:src Committed By: seanb Date: Wed Aug 19 18:52:48 UTC 2009 Modified Files: src/sys/netinet6: in6.h Log Message: - Newer gcc was throwning a 'dereferencing type-punned pointer will break strict-aliasing rules' warning against IN6_IS_ADDR_* macros at -O2 -Wall. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/netinet6/in6.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/netinet6/in6.h diff -u src/sys/netinet6/in6.h:1.66 src/sys/netinet6/in6.h:1.67 --- src/sys/netinet6/in6.h:1.66 Tue Dec 25 18:33:47 2007 +++ src/sys/netinet6/in6.h Wed Aug 19 18:52:48 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: in6.h,v 1.66 2007/12/25 18:33:47 perry Exp $ */ +/* $NetBSD: in6.h,v 1.67 2009/08/19 18:52:48 seanb Exp $ */ /* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */ /* @@ -231,37 +231,37 @@ * Unspecified */ #define IN6_IS_ADDR_UNSPECIFIED(a) \ - ((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) == 0)) + ((a)->__u6_addr.__u6_addr32[0] == 0 && \ + (a)->__u6_addr.__u6_addr32[1] == 0 && \ + (a)->__u6_addr.__u6_addr32[2] == 0 && \ + (a)->__u6_addr.__u6_addr32[3] == 0) /* * Loopback */ #define IN6_IS_ADDR_LOOPBACK(a) \ - ((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) == ntohl(1))) + ((a)->__u6_addr.__u6_addr32[0] == 0 && \ + (a)->__u6_addr.__u6_addr32[1] == 0 && \ + (a)->__u6_addr.__u6_addr32[2] == 0 && \ + (a)->__u6_addr.__u6_addr32[3] == ntohl(1)) /* * IPv4 compatible */ #define IN6_IS_ADDR_V4COMPAT(a) \ - ((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) != 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) != ntohl(1))) + ((a)->__u6_addr.__u6_addr32[0] == 0 && \ + (a)->__u6_addr.__u6_addr32[1] == 0 && \ + (a)->__u6_addr.__u6_addr32[2] == 0 && \ + (a)->__u6_addr.__u6_addr32[3] != 0 && \ + (a)->__u6_addr.__u6_addr32[3] != ntohl(1)) /* * Mapped */ #define IN6_IS_ADDR_V4MAPPED(a) \ - ((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x))) + ((a)->__u6_addr.__u6_addr32[0] == 0 && \ + (a)->__u6_addr.__u6_addr32[1] == 0 && \ + (a)->__u6_addr.__u6_addr32[2] == ntohl(0x)) /* * KAME Scope Values
CVS commit: src/dist/ipf
Module Name:src
Committed By: darrenr
Date: Wed Aug 19 18:51:24 UTC 2009
Modified Files:
src/dist/ipf: ipf2netbsd
Log Message:
When preparing ipfilter to import, remove files that are not related to
NetBSD in any way (such as those for Linux, Solaris, etc.)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/dist/ipf/ipf2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/ipf/ipf2netbsd
diff -u src/dist/ipf/ipf2netbsd:1.21 src/dist/ipf/ipf2netbsd:1.22
--- src/dist/ipf/ipf2netbsd:1.21 Wed Apr 30 13:10:47 2008
+++ src/dist/ipf/ipf2netbsd Wed Aug 19 18:51:24 2009
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: ipf2netbsd,v 1.21 2008/04/30 13:10:47 martin Exp $
+# $NetBSD: ipf2netbsd,v 1.22 2009/08/19 18:51:24 darrenr Exp $
#
# Copyright (c) 1999 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -104,6 +104,22 @@
cd $r/test
pax -rvw * $dregress
+### Remove uninteresting bits
+echo "removing extraneous files and directiones."
+(
+ cd ${dest}/src/dist/ipf
+ find . -name .cvsignore | xargs /bin/rm -f
+ for i in 4bsd AIX BSD BSDOS BSDOS3 BSDOS4 COMPILE.2.5 COMPILE.Solaris2 \
+ FAQ.FreeBSD FreeBSD FreeBSD-2.2 FreeBSD-3 FreeBSD-4.0 HPUX \
+ INST.FreeBSD-2.2 INSTALL.BSDOS INSTALL.FreeBSD INSTALL.IRIX \
+ INSTALL.Sol2 INSTALL.SunOS INSTALL.Tru64 Linux IRIX OSF \
+ INSTALL.NetBSD INSTALL.Linux INSTALL.xBSD INSTALL.BSDOS3 NAT.FreeBSD OpenBSD OpenBSD-2 OpenBSD-3 SunOS4 SunOS5 ipsend/.OLD; do
+ echo "removing $i";
+ /bin/rm -rf "$i"
+ done
+)
+echo done
+
### Remove the $'s around various RCSIDs
find $dest -type f -print | while read f; do
sed -e 's/\$\(Id.*\) \$/\1/' \
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: pgoyette
Date: Wed Aug 19 16:31:28 UTC 2009
Modified Files:
src/sys/dev/pci: ahcisata_pci.c pci_quirks.c
Log Message:
Use __arraycount() for readability
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ahcisata_pci.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/pci_quirks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.15 src/sys/dev/pci/ahcisata_pci.c:1.16
--- src/sys/dev/pci/ahcisata_pci.c:1.15 Thu Jun 11 11:02:11 2009
+++ src/sys/dev/pci/ahcisata_pci.c Wed Aug 19 16:31:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.15 2009/06/11 11:02:11 cegger Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.16 2009/08/19 16:31:28 pgoyette Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.15 2009/06/11 11:02:11 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.16 2009/08/19 16:31:28 pgoyette Exp $");
#include
#include
@@ -197,8 +197,7 @@
{
int i;
- for (i = 0; i < (sizeof ahci_pci_quirks / sizeof ahci_pci_quirks[0]);
- i++)
+ for (i = 0; i < __arraycount(ahci_pci_quirks); i++)
if (vendor == ahci_pci_quirks[i].vendor &&
product == ahci_pci_quirks[i].product)
return (&ahci_pci_quirks[i]);
Index: src/sys/dev/pci/pci_quirks.c
diff -u src/sys/dev/pci/pci_quirks.c:1.8 src/sys/dev/pci/pci_quirks.c:1.9
--- src/sys/dev/pci/pci_quirks.c:1.8 Sat Jan 6 00:08:20 2007
+++ src/sys/dev/pci/pci_quirks.c Wed Aug 19 16:31:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_quirks.c,v 1.8 2007/01/06 00:08:20 jmcneill Exp $ */
+/* $NetBSD: pci_quirks.c,v 1.9 2009/08/19 16:31:28 pgoyette Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_quirks.c,v 1.8 2007/01/06 00:08:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_quirks.c,v 1.9 2009/08/19 16:31:28 pgoyette Exp $");
#include
#include
@@ -56,7 +56,7 @@
{
int i;
- for (i = 0; i < (sizeof pci_quirks / sizeof pci_quirks[0]); i++)
+ for (i = 0; i < __arraycount(pci_quirks); i++)
if (vendor == pci_quirks[i].vendor &&
product == pci_quirks[i].product)
return (&pci_quirks[i]);
CVS commit: src/sys/dev/isa
Module Name:src Committed By: cegger Date: Wed Aug 19 16:23:28 UTC 2009 Modified Files: src/sys/dev/isa: isa.c Log Message: build fix: isa_detach_hook() needs isa_chipset_tag_t as first argument. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/sys/dev/isa/isa.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/isa/isa.c diff -u src/sys/dev/isa/isa.c:1.136 src/sys/dev/isa/isa.c:1.137 --- src/sys/dev/isa/isa.c:1.136 Tue Aug 18 16:52:42 2009 +++ src/sys/dev/isa/isa.c Wed Aug 19 16:23:28 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa.c,v 1.136 2009/08/18 16:52:42 dyoung Exp $ */ +/* $NetBSD: isa.c,v 1.137 2009/08/19 16:23:28 cegger Exp $ */ /*- * Copyright (c) 1998, 2001, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.136 2009/08/18 16:52:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.137 2009/08/19 16:23:28 cegger Exp $"); #include #include @@ -154,7 +154,7 @@ #if NISADMA > 0 isa_dmadestroy(sc->sc_ic); #endif - isa_detach_hook(self); + isa_detach_hook(sc->sc_ic, self); return 0; }
CVS commit: src/lib/libc/gen
Module Name:src Committed By: joerg Date: Wed Aug 19 15:47:39 UTC 2009 Modified Files: src/lib/libc/gen: getdiskbyname.3 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/gen/getdiskbyname.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/getdiskbyname.3 diff -u src/lib/libc/gen/getdiskbyname.3:1.12 src/lib/libc/gen/getdiskbyname.3:1.13 --- src/lib/libc/gen/getdiskbyname.3:1.12 Thu Aug 7 16:42:49 2003 +++ src/lib/libc/gen/getdiskbyname.3 Wed Aug 19 15:47:39 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: getdiskbyname.3,v 1.12 2003/08/07 16:42:49 agc Exp $ +.\" $NetBSD: getdiskbyname.3,v 1.13 2009/08/19 15:47:39 joerg Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -62,7 +62,7 @@ The .Fn setdisktab function changes the default -.Pn disktab +.Sy disktab file name from .Pa /etc/disktab .Pq aka Dv _PATH_DISKTAB
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: joerg
Date: Wed Aug 19 15:43:02 UTC 2009
Modified Files:
src/lib/libc/gen: cgetcap.3
Log Message:
Fix markup.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/gen/cgetcap.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/cgetcap.3
diff -u src/lib/libc/gen/cgetcap.3:1.5 src/lib/libc/gen/cgetcap.3:1.6
--- src/lib/libc/gen/cgetcap.3:1.5 Tue Aug 26 05:04:19 2008
+++ src/lib/libc/gen/cgetcap.3 Wed Aug 19 15:43:02 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgetcap.3,v 1.5 2008/08/26 05:04:19 lukem Exp $
+.\" $NetBSD: cgetcap.3,v 1.6 2009/08/19 15:43:02 joerg Exp $
.\"
.\" Copyright (c) 1992, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -534,17 +534,17 @@
codes, new lines, and colons may be conveniently represented by the use
of escape sequences:
.Bl -column "\e\|X,X\e\|X" "(ASCII octal nnn)"
-^X ('\fIX\fP' \*[Am] 037) control-\fIX\fP
-\e\|b, \e\|B (ASCII 010) backspace
-\e\|t, \e\|T (ASCII 011) tab
-\e\|n, \e\|N (ASCII 012) line feed (newline)
-\e\|f, \e\|F (ASCII 014) form feed
-\e\|r, \e\|R (ASCII 015) carriage return
-\e\|e, \e\|E (ASCII 027) escape
-\e\|c, \e\|C (:) colon
-\e\|\e (\e\|) back slash
-\e\|^ (^) caret
-\e\|\fInnn\fP (ASCII octal \fInnn\fP)
+.It ^X ('\fIX\fP' \*[Am] 037) control-\fIX\fP
+.It \e\|b, \e\|B (ASCII 010) backspace
+.It \e\|t, \e\|T (ASCII 011) tab
+.It \e\|n, \e\|N (ASCII 012) line feed (newline)
+.It \e\|f, \e\|F (ASCII 014) form feed
+.It \e\|r, \e\|R (ASCII 015) carriage return
+.It \e\|e, \e\|E (ASCII 027) escape
+.It \e\|c, \e\|C (:) colon
+.It \e\|\e (\e\|) back slash
+.It \e\|^ (^) caret
+.It \e\|\fInnn\fP (ASCII octal \fInnn\fP)
.El
.Pp
A
CVS commit: src/usr.bin/mixerctl
Module Name:src
Committed By: joerg
Date: Wed Aug 19 15:26:59 UTC 2009
Modified Files:
src/usr.bin/mixerctl: mixerctl.1
Log Message:
Fix-up syntax after wizd.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/mixerctl/mixerctl.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mixerctl/mixerctl.1
diff -u src/usr.bin/mixerctl/mixerctl.1:1.23 src/usr.bin/mixerctl/mixerctl.1:1.24
--- src/usr.bin/mixerctl/mixerctl.1:1.23 Fri Aug 15 21:10:57 2008
+++ src/usr.bin/mixerctl/mixerctl.1 Wed Aug 19 15:26:59 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: mixerctl.1,v 1.23 2008/08/15 21:10:57 wiz Exp $
+.\" $NetBSD: mixerctl.1,v 1.24 2009/08/19 15:26:59 joerg Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -99,7 +99,7 @@
flag shows the possible values of enumeration and set valued
variables.
Enumerated values are shown in brackets
-.Pp Dq []
+.Pq Dq []
and set values are shown in curly braces
.Pq Dq {} .
.Pp
CVS commit: src/lib/libevent
Module Name:src
Committed By: tls
Date: Wed Aug 19 15:18:05 UTC 2009
Modified Files:
src/lib/libevent: Makefile event.h
Log Message:
Oops. As Matthias pointed out, I swapped '-' for '_' in the previous
commit. Fix that. Also, some applications written for newer libevent
want event.h to pull in event_config.h by magic.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libevent/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libevent/event.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libevent/Makefile
diff -u src/lib/libevent/Makefile:1.7 src/lib/libevent/Makefile:1.8
--- src/lib/libevent/Makefile:1.7 Wed Aug 19 01:38:39 2009
+++ src/lib/libevent/Makefile Wed Aug 19 15:18:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/08/19 01:38:39 tls Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/19 15:18:05 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
NOLINT= # Until someone explains to me how to avoid lint stupidity
@@ -11,7 +11,7 @@
SRCS= buffer.c evbuffer.c evdns.c event.c event_tagging.c evrpc.c evutil.c \
http.c kqueue.c log.c poll.c signal.c
-INCS= evdns.h event.h evhttp.h evrpc.h evutil.h event_config.h
+INCS= evdns.h event.h evhttp.h evrpc.h evutil.h event-config.h
INCSDIR=/usr/include
MAN= evdns.3 event.3
@@ -89,7 +89,7 @@
MLINKS+=evdns.3 evdns_search_ndots_set.3
MLINKS+=evdns.3 evdns_set_log_fn.3
-event_config.h: config.h
+event-config.h: config.h
sed -e 's/#define /#define _EVENT_/' ${.ALLSRC} > ${.OBJDIR}/${.TARGET}
.include
Index: src/lib/libevent/event.h
diff -u src/lib/libevent/event.h:1.6 src/lib/libevent/event.h:1.7
--- src/lib/libevent/event.h:1.6 Wed Jul 8 21:23:53 2009
+++ src/lib/libevent/event.h Wed Aug 19 15:18:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: event.h,v 1.6 2009/07/08 21:23:53 tls Exp $ */
+/* $NetBSD: event.h,v 1.7 2009/08/19 15:18:05 tls Exp $ */
/* $OpenBSD: event.h,v 1.4 2002/07/12 18:50:48 provos Exp $ */
/*
@@ -165,6 +165,7 @@
extern "C" {
#endif
+#include
#include
#include
#include
CVS commit: src/usr.bin/window
Module Name:src Committed By: joerg Date: Wed Aug 19 15:17:05 UTC 2009 Modified Files: src/usr.bin/window: window.1 Log Message: Don't use .Xo/.Xc. Fix markup of alias command. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.bin/window/window.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/window/window.1 diff -u src/usr.bin/window/window.1:1.18 src/usr.bin/window/window.1:1.19 --- src/usr.bin/window/window.1:1.18 Thu Jun 25 23:20:55 2009 +++ src/usr.bin/window/window.1 Wed Aug 19 15:17:05 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: window.1,v 1.18 2009/06/25 23:20:55 wiz Exp $ +.\" $NetBSD: window.1,v 1.19 2009/08/19 15:17:05 joerg Exp $ .\" .\" Copyright (c) 1985, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -471,11 +471,7 @@ .Pp The operators in order of increasing precedence: .Bl -tag -width Fl -.It Xo -.Aq Va expr1 -.Ic = -.Aq Va expr2 -.Xc +.It Ao Va expr1 Ac Ic = Ao Va expr2 Ac Assignment. The variable of name .Aq Va expr1 , @@ -484,13 +480,7 @@ .Aq Va expr2 . Returns the value of .Aq Va expr2 . -.It Xo -.Aq Va expr1 -.Ic \&? -.Aq Va expr2 -.Ic : -.Aq Va expr3 -.Xc +.It Ao Va expr1 Ac Ic \&? Ao Va expr2 Ac Ic : Ao Va expr3 Ac Returns the value of .Aq Va expr2 if @@ -507,11 +497,7 @@ .Aq Va Expr1 must be numeric. -.It Xo -.Aq Va expr1 -.Ic \&|\&| -.Aq Va expr2 -.Xc +.It Ao Va expr1 Ac Ic \&|\&| Ao Va expr2 Ac Logical or. Numeric values only. Short circuit evaluation is supported @@ -520,70 +506,33 @@ evaluates true, then .Aq Va expr2 is not evaluated). -.It Xo -.Aq Va expr1 -.Ic \&\*[Am]\&\*[Am] -.Aq Va expr2 -.Xc +.It Ao Va expr1 Ac Ic \&\*[Am]\&\*[Am] Ao Va expr2 Ac Logical and with short circuit evaluation. Numeric values only. -.It Xo -.Aq Va expr1 -.Ic \&| -.Aq Va expr2 -.Xc +.It Ao Va expr1 Ac Ic \&| Ao Va expr2 Ac Bitwise or. Numeric values only. -.It Xo -.Aq Va expr1 -.Ic ^ -.Aq Va expr2 -.Xc +.It Ao Va expr1 Ac Ic ^ Ao Va expr2 Ac Bitwise exclusive or. Numeric values only. -.It Xo -.Aq Va expr1 -.Ic \&\*[Am] -.Aq Va expr2 -.Xc +.It Ao Va expr1 Ac Ic \&\*[Am] Ao Va expr2 Ac Bitwise and. Numeric values only. -.It Xo -.Aq Va expr1 -.Ic == -.Aq Va expr2 , -.Aq Va expr1 -.Ic != -.Aq expr2 -.Xc +.It Ao Va expr1 Ac Ic == Ao Va expr2 Ac , Ao Va expr1 Ac Ic != Ao expr2 Ac Comparison (equal and not equal, respectively). The boolean result (either 1 or 0) of the comparison is returned. The operands can be numeric or string valued. One string operand forces the other to be converted to a string in necessary. -.It Xo -.Aq Va expr1 -.Ic \*[Lt] -.Aq Va expr2 , -.Aq Va expr1 -.Ic \*[Gt] -.Aq Va expr2 , -.Aq Va expr1 -.Ic \*[Le] -.Aq Va expr2 , -.Xc +.It Ao Va expr1 Ac Ic \*[Lt] Ao Va expr2 Ac , \ +Ao Va expr1 Ac Ic \*[Gt] Ao Va expr2 Ac , \ +Ao Va expr1 Ac Ic \*[Le] Ao Va expr2 Ac , Less than, greater than, less than or equal to, greater than or equal to. Both numeric and string values, with automatic conversion as above. -.It Xo -.Aq Va expr1 -.Ic \*[Lt]\*[Lt] -.Aq Va expr2 , -.Aq Va expr1 -.Ic \*[Gt]\*[Gt] -.Aq Va expr2 -.Xc +.It Ao Va expr1 Ac Ic \*[Lt]\*[Lt] Ao Va expr2 Ac , \ +Ao Va expr1 Ac Ic \*[Gt]\*[Gt] Ao Va expr2 Ac If both operands are numbers, .Aq Va expr1 is bit @@ -600,40 +549,19 @@ .Aq Va expr2 is also a string, then its length is used in place of its value). -.It Xo -.Aq Va expr1 -.Ic + -.Aq Va expr2 , -.Aq Va expr1 -.Ic - -.Aq Va expr2 -.Xc +.It Ao Va expr1 Ac Ic + Ao Va expr2 Ac , Ao Va expr1 Ac Ic - Ao Va expr2 Ac Addition and subtraction on numbers. For .Dq + , if one argument is a string, then the other is converted to a string, and the result is the concatenation of the two strings. -.It Xo -.Aq Va expr1 -.Ic \&* -.Aq Va expr2 , -.Aq Va expr1 -.Ic \&/ -.Aq Va expr2 , -.Aq Va expr1 -.Ic \&% -.Aq Va expr2 -.Xc +.It Ao Va expr1 Ac Ic \&* Ao Va expr2 Ac , \ +Ao Va expr1 Ac Ic \&/ Ao Va expr2 Ac , Ao Va expr1 Ac Ic \&% Ao Va expr2 Ac Multiplication, division, modulo. Numbers only. -.It Xo -.Ic \- Ns Aq Va expr , -.Ic ~ Ns Aq Va expr , -.Ic \&! Ns Aq Va expr , -.Ic \&$ Ns Aq Va expr , -.Ic \&$? Ns Aq Va expr -.Xc +.It Ic \- Ns Ao Va expr Ac , Ic ~ Ns Ao Va expr Ac , \ +Ic \&! Ns Ao Va expr Ac , Ic \&$ Ns Ao Va expr Ac , Ic \&$? Ns Ao Va expr Ac The first three are unary minus, bitwise complement and logical complement on numbers only. The operator, @@ -654,9 +582,7 @@ .Aq Va expr , and returns 1 if it exists or 0 otherwise. -.It Xo -.Ao Va expr Ac Ns Pq Aq Ar arglist -.Xc +.It Ao Va expr Ac Ns Pq Aq Ar arglist Function call. .Aq Va Expr must be a string that is the unique @@ -720,10 +646,7 @@ obvious meanings, or it can be a numeric expression, in which case a non-zero value is true. .Bl -tag -width Fl -.It Xo -.Ic alias Ns Po Bq Aq Ar string , -.Bq Aq Ar string\-list Pc -.Xc +.It Ic alias Ns Po Bo Ao Ar string Ac Bc , Bo Ao Ar string\-list Ac
CVS commit: src/sys/arch/algor/pci
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:17:00 UTC 2009
Modified Files:
src/sys/arch/algor/pci: pcib.c
Log Message:
Define, and hook into the isa_chipset_tag_t, pcib_isa_detach_hook().
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/pci/pcib.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/algor/pci/pcib.c
diff -u src/sys/arch/algor/pci/pcib.c:1.20 src/sys/arch/algor/pci/pcib.c:1.21
--- src/sys/arch/algor/pci/pcib.c:1.20 Sat Mar 14 15:35:59 2009
+++ src/sys/arch/algor/pci/pcib.c Wed Aug 19 15:17:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.20 2009/03/14 15:35:59 dsl Exp $ */
+/* $NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.20 2009/03/14 15:35:59 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $");
#include "opt_algor_p5064.h"
#include "opt_algor_p6032.h"
@@ -119,6 +119,7 @@
void pcib_isa_attach_hook(struct device *, struct device *,
struct isabus_attach_args *);
+void pcib_isa_detach_hook(isa_chipset_tag_t, device_t);
int pcib_intr(void *);
@@ -316,6 +317,7 @@
iba.iba_ic = &sc->sc_ic;
iba.iba_ic->ic_attach_hook = pcib_isa_attach_hook;
+ iba.iba_ic->ic_detach_hook = pcib_isa_detach_hook;
(void) config_found_ia(&sc->sc_dev, "isabus", &iba, isabusprint);
}
@@ -329,6 +331,13 @@
}
void
+pcib_isa_detach_hook(isa_chipset_tag_t ic, device_t self)
+{
+
+ /* Nothing to do. */
+}
+
+void
pcib_set_icus(struct pcib_softc *sc)
{
CVS commit: src/sys/arch/arc/isa
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:16:10 UTC 2009
Modified Files:
src/sys/arch/arc/isa: isabus.c
Log Message:
Define, and hook into the isa_chipset_tag_t, isabr_detach_hook().
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arc/isa/isabus.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/arc/isa/isabus.c
diff -u src/sys/arch/arc/isa/isabus.c:1.44 src/sys/arch/arc/isa/isabus.c:1.45
--- src/sys/arch/arc/isa/isabus.c:1.44 Sat Jul 5 08:46:25 2008
+++ src/sys/arch/arc/isa/isabus.c Wed Aug 19 15:16:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isabus.c,v 1.44 2008/07/05 08:46:25 tsutsui Exp $ */
+/* $NetBSD: isabus.c,v 1.45 2009/08/19 15:16:09 dyoung Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@@ -120,7 +120,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.44 2008/07/05 08:46:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.45 2009/08/19 15:16:09 dyoung Exp $");
#include
#include
@@ -166,6 +166,7 @@
static void isabr_attach_hook(device_t , device_t,
struct isabus_attach_args *);
+static void isabr_detach_hook(isa_chipset_tag_t, device_t);
static const struct evcnt *isabr_intr_evcnt(isa_chipset_tag_t, int);
static void *isabr_intr_establish(isa_chipset_tag_t, int, int, int,
int (*)(void *), void *);
@@ -193,6 +194,7 @@
isabr_initicu();
sc->arc_isa_cs.ic_attach_hook = isabr_attach_hook;
+ sc->arc_isa_cs.ic_detach_hook = isabr_detach_hook;
sc->arc_isa_cs.ic_intr_evcnt = isabr_intr_evcnt;
sc->arc_isa_cs.ic_intr_establish = isabr_intr_establish;
sc->arc_isa_cs.ic_intr_disestablish = isabr_intr_disestablish;
@@ -314,6 +316,13 @@
/* Nothing to do. */
}
+static void
+isabr_detach_hook(isa_chipset_tag_t ic, device_t self)
+{
+
+ /* Nothing to do. */
+}
+
static const struct evcnt *
isabr_intr_evcnt(isa_chipset_tag_t ic, int irq)
{
CVS commit: src/sys/arch/atari/isa
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:15:21 UTC 2009
Modified Files:
src/sys/arch/atari/isa: isa_machdep.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/atari/isa/isa_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/atari/isa/isa_machdep.c
diff -u src/sys/arch/atari/isa/isa_machdep.c:1.34 src/sys/arch/atari/isa/isa_machdep.c:1.35
--- src/sys/arch/atari/isa/isa_machdep.c:1.34 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/atari/isa/isa_machdep.c Wed Aug 19 15:15:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.34 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.35 2009/08/19 15:15:21 dyoung Exp $ */
/*
* Copyright (c) 1997 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.34 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.35 2009/08/19 15:15:21 dyoung Exp $");
#include
#include
@@ -155,7 +155,7 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t, device_t self)
{
}
CVS commit: src/sys/arch/evbarm/tsarm/isa
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:15:00 UTC 2009
Modified Files:
src/sys/arch/evbarm/tsarm/isa: isa_machdep.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/tsarm/isa/isa_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/evbarm/tsarm/isa/isa_machdep.c
diff -u src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.9 src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.10
--- src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.9 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/evbarm/tsarm/isa/isa_machdep.c Wed Aug 19 15:14:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.9 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.10 2009/08/19 15:14:59 dyoung Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.9 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.10 2009/08/19 15:14:59 dyoung Exp $");
#include "opt_irqstats.h"
@@ -196,6 +196,6 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
}
CVS commit: src/sys/arch/evbmips/malta/pci
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:13:56 UTC 2009
Modified Files:
src/sys/arch/evbmips/malta/pci: pcib.c
Log Message:
Define, and hook into the isa_chipset_tag_t, pcib_isa_detach_hook().
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/malta/pci/pcib.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/evbmips/malta/pci/pcib.c
diff -u src/sys/arch/evbmips/malta/pci/pcib.c:1.12 src/sys/arch/evbmips/malta/pci/pcib.c:1.13
--- src/sys/arch/evbmips/malta/pci/pcib.c:1.12 Fri May 12 10:58:12 2006
+++ src/sys/arch/evbmips/malta/pci/pcib.c Wed Aug 19 15:13:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.12 2006/05/12 10:58:12 tsutsui Exp $ */
+/* $NetBSD: pcib.c,v 1.13 2009/08/19 15:13:56 dyoung Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.12 2006/05/12 10:58:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.13 2009/08/19 15:13:56 dyoung Exp $");
#include
#include
@@ -130,6 +130,7 @@
static void pcib_isa_intr_disestablish(void *, void *);
static void pcib_isa_attach_hook(struct device *, struct device *,
struct isabus_attach_args *);
+static void pcib_isa_detach_hook(isa_chipset_tag_t, device_t);
static int pcib_isa_intr_alloc(void *, int, int, int *);
static const char *
pcib_isa_intr_string(void *, int);
@@ -324,6 +325,7 @@
iba.iba_ic = &sc->sc_ic;
iba.iba_ic->ic_attach_hook = pcib_isa_attach_hook;
+ iba.iba_ic->ic_detach_hook = pcib_isa_detach_hook;
config_found_ia(&sc->sc_dev, "isabus", &iba, isabusprint);
}
@@ -337,6 +339,13 @@
}
static void
+pcib_isa_detach_hook(isa_chipset_tag_t ic, device_t self)
+{
+
+ /* Nothing to do. */
+}
+
+static void
pcib_set_icus(struct pcib_softc *sc)
{
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:13:24 UTC 2009
Modified Files:
src/sys/arch/hp700/dev: mongoose.c
Log Message:
Define, and hook into the isa_chipset_tag_t, mg_isa_detach_hook().
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/dev/mongoose.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/hp700/dev/mongoose.c
diff -u src/sys/arch/hp700/dev/mongoose.c:1.15 src/sys/arch/hp700/dev/mongoose.c:1.16
--- src/sys/arch/hp700/dev/mongoose.c:1.15 Sun May 24 06:53:34 2009
+++ src/sys/arch/hp700/dev/mongoose.c Wed Aug 19 15:13:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mongoose.c,v 1.15 2009/05/24 06:53:34 skrll Exp $ */
+/* $NetBSD: mongoose.c,v 1.16 2009/08/19 15:13:24 dyoung Exp $ */
/* $OpenBSD: mongoose.c,v 1.7 2000/08/15 19:42:56 mickey Exp $ */
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.15 2009/05/24 06:53:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.16 2009/08/19 15:13:24 dyoung Exp $");
#define MONGOOSE_DEBUG 9
@@ -213,6 +213,7 @@
int mg_intr_map(void *, u_int, eisa_intr_handle_t *);
const char *mg_intr_string(void *, int);
void mg_isa_attach_hook(device_t, device_t, struct isabus_attach_args *);
+void mg_isa_detach_hook(isa_chipset_tag_t, device_t);
void *mg_intr_establish(void *, int, int, int, int (*)(void *), void *);
void mg_intr_disestablish(void *, void *);
int mg_intr_check(void *, int, int);
@@ -275,6 +276,12 @@
}
+void
+mg_isa_detach_hook(isa_chipset_tag_t ic, device_t self)
+{
+
+}
+
void *
mg_intr_establish(void *v, int irq, int type, int pri,
int (*handler)(void *), void *arg)
@@ -676,6 +683,7 @@
sc->sc_ic.ic_v = sc;
sc->sc_ic.ic_attach_hook = mg_isa_attach_hook;
+ sc->sc_ic.ic_detach_hook = mg_isa_detach_hook;
sc->sc_ic.ic_intr_establish = mg_intr_establish;
sc->sc_ic.ic_intr_disestablish = mg_intr_disestablish;
sc->sc_ic.ic_intr_check = mg_intr_check;
CVS commit: src/sys/arch/hpcmips/isa
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:12:31 UTC 2009
Modified Files:
src/sys/arch/hpcmips/isa: isa_machdep.c plumisa_machdep.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hpcmips/isa/isa_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcmips/isa/plumisa_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/hpcmips/isa/isa_machdep.c
diff -u src/sys/arch/hpcmips/isa/isa_machdep.c:1.37 src/sys/arch/hpcmips/isa/isa_machdep.c:1.38
--- src/sys/arch/hpcmips/isa/isa_machdep.c:1.37 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/hpcmips/isa/isa_machdep.c Wed Aug 19 15:12:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.37 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.38 2009/08/19 15:12:31 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.37 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.38 2009/08/19 15:12:31 dyoung Exp $");
#include "opt_vr41xx.h"
@@ -200,7 +200,7 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
}
Index: src/sys/arch/hpcmips/isa/plumisa_machdep.c
diff -u src/sys/arch/hpcmips/isa/plumisa_machdep.c:1.10 src/sys/arch/hpcmips/isa/plumisa_machdep.c:1.11
--- src/sys/arch/hpcmips/isa/plumisa_machdep.c:1.10 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/hpcmips/isa/plumisa_machdep.c Wed Aug 19 15:12:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: plumisa_machdep.c,v 1.10 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: plumisa_machdep.c,v 1.11 2009/08/19 15:12:31 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: plumisa_machdep.c,v 1.10 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumisa_machdep.c,v 1.11 2009/08/19 15:12:31 dyoung Exp $");
#include
#include
@@ -140,7 +140,7 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t, device_t self)
{
}
CVS commit: src/sys/arch/mipsco/isa
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:11:53 UTC 2009
Modified Files:
src/sys/arch/mipsco/isa: isa_machdep.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mipsco/isa/isa_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/mipsco/isa/isa_machdep.c
diff -u src/sys/arch/mipsco/isa/isa_machdep.c:1.13 src/sys/arch/mipsco/isa/isa_machdep.c:1.14
--- src/sys/arch/mipsco/isa/isa_machdep.c:1.13 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/mipsco/isa/isa_machdep.c Wed Aug 19 15:11:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.13 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.14 2009/08/19 15:11:53 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.13 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.14 2009/08/19 15:11:53 dyoung Exp $");
#include
#include
@@ -162,7 +162,7 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
}
CVS commit: src/sys/arch/shark/isa
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:11:22 UTC 2009
Modified Files:
src/sys/arch/shark/isa: isa_shark_machdep.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/shark/isa/isa_shark_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/shark/isa/isa_shark_machdep.c
diff -u src/sys/arch/shark/isa/isa_shark_machdep.c:1.13 src/sys/arch/shark/isa/isa_shark_machdep.c:1.14
--- src/sys/arch/shark/isa/isa_shark_machdep.c:1.13 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/shark/isa/isa_shark_machdep.c Wed Aug 19 15:11:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_shark_machdep.c,v 1.13 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: isa_shark_machdep.c,v 1.14 2009/08/19 15:11:22 dyoung Exp $ */
/*
* Copyright 1997
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_shark_machdep.c,v 1.13 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_shark_machdep.c,v 1.14 2009/08/19 15:11:22 dyoung Exp $");
#include
#include
@@ -228,6 +228,6 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
}
CVS commit: src/sys/arch
Module Name:src Committed By: dyoung Date: Wed Aug 19 15:09:57 UTC 2009 Modified Files: src/sys/arch/algor/include: isa_machdep.h src/sys/arch/alpha/include: isa_machdep.h src/sys/arch/arc/include: isa_machdep.h src/sys/arch/atari/include: isa_machdep.h src/sys/arch/hp700/include: isa_machdep.h src/sys/arch/hpcmips/include: isa_machdep.h src/sys/arch/mips/include: isa_machdep.h src/sys/arch/mipsco/include: isa_machdep.h src/sys/arch/mvmeppc/include: isa_machdep.h Log Message: (Re-)define isa_detach_hook(), and define isa_dmadestroy(). Update some isa_chipset_tag_t->ic_detach_hook() definitions. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/include/isa_machdep.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/alpha/include/isa_machdep.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/include/isa_machdep.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/atari/include/isa_machdep.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp700/include/isa_machdep.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcmips/include/isa_machdep.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/include/isa_machdep.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mipsco/include/isa_machdep.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvmeppc/include/isa_machdep.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/algor/include/isa_machdep.h diff -u src/sys/arch/algor/include/isa_machdep.h:1.5 src/sys/arch/algor/include/isa_machdep.h:1.6 --- src/sys/arch/algor/include/isa_machdep.h:1.5 Mon Apr 28 20:23:10 2008 +++ src/sys/arch/algor/include/isa_machdep.h Wed Aug 19 15:09:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.5 2008/04/28 20:23:10 martin Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.6 2009/08/19 15:09:56 dyoung Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -75,6 +75,7 @@ int (*)(void *), void *); void (*ic_intr_disestablish)(void *, void *); int (*ic_intr_alloc)(void *, int, int, int *); + void (*ic_detach_hook)(isa_chipset_tag_t, device_t); }; @@ -83,6 +84,8 @@ */ #define isa_attach_hook(p, s, a) \ (*(a)->iba_ic->ic_attach_hook)((p), (s), (a)) +#define isa_detach_hook(c, s) \ +(*(c)->ic_detach_hook)((c), (s)) #define isa_intr_evcnt(c, i) \ (*(c)->ic_intr_evcnt)((c)->ic_v, (i)) #define isa_intr_establish(c, i, t, l, f, a)\ @@ -94,6 +97,8 @@ #define isa_dmainit(ic, bst, dmat, d) \ _isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d)) +#define isa_dmadestroy(ic) \ + _isa_dmadestroy(&(ic)->ic_dmastate) #define isa_dmacascade(ic, c) \ _isa_dmacascade(&(ic)->ic_dmastate, (c)) #define isa_dmamaxsize(ic, c) \ Index: src/sys/arch/alpha/include/isa_machdep.h diff -u src/sys/arch/alpha/include/isa_machdep.h:1.11 src/sys/arch/alpha/include/isa_machdep.h:1.12 --- src/sys/arch/alpha/include/isa_machdep.h:1.11 Wed Aug 19 15:00:23 2009 +++ src/sys/arch/alpha/include/isa_machdep.h Wed Aug 19 15:09:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.11 2009/08/19 15:00:23 dyoung Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.12 2009/08/19 15:09:56 dyoung Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -75,6 +75,7 @@ int (*)(void *), void *); void (*ic_intr_disestablish)(void *, void *); int (*ic_intr_alloc)(void *, int, int, int *); + void (*ic_detach_hook)(isa_chipset_tag_t, device_t); }; Index: src/sys/arch/arc/include/isa_machdep.h diff -u src/sys/arch/arc/include/isa_machdep.h:1.13 src/sys/arch/arc/include/isa_machdep.h:1.14 --- src/sys/arch/arc/include/isa_machdep.h:1.13 Mon Jun 12 15:39:01 2006 +++ src/sys/arch/arc/include/isa_machdep.h Wed Aug 19 15:09:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.13 2006/06/12 15:39:01 tsutsui Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.14 2009/08/19 15:09:56 dyoung Exp $ */ /* $OpenBSD: isa_machdep.h,v 1.5 1997/04/19 17:20:00 pefo Exp $ */ /* @@ -57,6 +57,7 @@ void*(*ic_intr_establish)(isa_chipset_tag_t, int, int, int, int (*)(void *), void *); void(*ic_intr_disestablish)(isa_chipset_tag_t, void *); + void (*ic_detach_hook)(isa_chipset_tag_t, device_t); }; @@ -65,6 +66,8 @@ */ #define isa_attach_hook(p, s, a) /* \ (*(a)->iba_ic->ic_attach_hook)((p), (s), (a)) */ +#define isa_detach_hook(c, s) \ +(*(c)->ic_detach_hook)((c), (s)) #define isa_intr_evcnt(c, i) \ (*(c)->ic_intr_evcnt)((c)->ic_data, (i)) #define isa_intr_establish(c, i, t, l, f, a) \ @@ -74,6 +77,8 @@ #define isa_dmainit(ic, bst, dmat, d) \ _isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d)) +#define isa_dmadestroy(ic) \ + _isa_dmadestroy(&(ic)->ic_dmastate) #define isa_dmacascade(ic, c) \ _isa_dmacascade(&(ic)->ic_dmastate, (c)) #define isa_dmam
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:05:01 UTC 2009
Modified Files:
src/sys/arch/xen/xen: isa_machdep.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/xen/xen/isa_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/isa_machdep.c
diff -u src/sys/arch/xen/xen/isa_machdep.c:1.21 src/sys/arch/xen/xen/isa_machdep.c:1.22
--- src/sys/arch/xen/xen/isa_machdep.c:1.21 Tue Aug 18 17:02:01 2009
+++ src/sys/arch/xen/xen/isa_machdep.c Wed Aug 19 15:05:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.21 2009/08/18 17:02:01 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.22 2009/08/19 15:05:01 dyoung Exp $ */
/* NetBSD isa_machdep.c,v 1.11 2004/06/20 18:04:08 thorpej Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.21 2009/08/18 17:02:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.22 2009/08/19 15:05:01 dyoung Exp $");
#include
#include
@@ -221,7 +221,7 @@
/* XXX share with x86 */
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
extern int isa_has_been_seen;
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:04:27 UTC 2009
Modified Files:
src/sys/arch/x86/include: isa_machdep.h
src/sys/arch/x86/isa: isa_machdep.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/include/isa_machdep.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/isa/isa_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/x86/include/isa_machdep.h
diff -u src/sys/arch/x86/include/isa_machdep.h:1.9 src/sys/arch/x86/include/isa_machdep.h:1.10
--- src/sys/arch/x86/include/isa_machdep.h:1.9 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/x86/include/isa_machdep.h Wed Aug 19 15:04:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.9 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.10 2009/08/19 15:04:27 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
void isa_attach_hook(device_t, device_t,
struct isabus_attach_args *);
-void isa_detach_hook(device_t);
+void isa_detach_hook(isa_chipset_tag_t, device_t);
int isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
const struct evcnt *isa_intr_evcnt(isa_chipset_tag_t ic, int irq);
void *isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
Index: src/sys/arch/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.27 src/sys/arch/x86/isa/isa_machdep.c:1.28
--- src/sys/arch/x86/isa/isa_machdep.c:1.27 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/x86/isa/isa_machdep.c Wed Aug 19 15:04:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.27 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.28 2009/08/19 15:04:27 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.27 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.28 2009/08/19 15:04:27 dyoung Exp $");
#include
#include
@@ -291,7 +291,7 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
extern int isa_has_been_seen;
CVS commit: src/sys/arch/powerpc/isa
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:02:48 UTC 2009
Modified Files:
src/sys/arch/powerpc/isa: isa_machdep_common.c
Log Message:
genppc_isa_detach_hook() needs two arguments, the first an
isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/isa/isa_machdep_common.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/powerpc/isa/isa_machdep_common.c
diff -u src/sys/arch/powerpc/isa/isa_machdep_common.c:1.4 src/sys/arch/powerpc/isa/isa_machdep_common.c:1.5
--- src/sys/arch/powerpc/isa/isa_machdep_common.c:1.4 Wed Aug 19 14:44:48 2009
+++ src/sys/arch/powerpc/isa/isa_machdep_common.c Wed Aug 19 15:02:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep_common.c,v 1.4 2009/08/19 14:44:48 dyoung Exp $ */
+/* $NetBSD: isa_machdep_common.c,v 1.5 2009/08/19 15:02:47 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep_common.c,v 1.4 2009/08/19 14:44:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep_common.c,v 1.5 2009/08/19 15:02:47 dyoung Exp $");
#include
#include
@@ -84,7 +84,7 @@
}
void
-genppc_isa_detach_hook(device_t self)
+genppc_isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
/* Nothing to do. */
CVS commit: src/sys/arch/sandpoint/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 15:02:26 UTC 2009 Modified Files: src/sys/arch/sandpoint/include: isa_machdep.h Log Message: isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sandpoint/include/isa_machdep.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/sandpoint/include/isa_machdep.h diff -u src/sys/arch/sandpoint/include/isa_machdep.h:1.8 src/sys/arch/sandpoint/include/isa_machdep.h:1.9 --- src/sys/arch/sandpoint/include/isa_machdep.h:1.8 Wed Aug 19 14:41:57 2009 +++ src/sys/arch/sandpoint/include/isa_machdep.h Wed Aug 19 15:02:26 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.8 2009/08/19 14:41:57 dyoung Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.9 2009/08/19 15:02:26 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -43,8 +43,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) -#define isa_detach_hook(s) \ - genppc_isa_detach_hook(s) +#define isa_detach_hook(c, s) \ + genppc_isa_detach_hook(c, s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/prep/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 15:02:05 UTC 2009 Modified Files: src/sys/arch/prep/include: isa_machdep.h Log Message: isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/prep/include/isa_machdep.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/prep/include/isa_machdep.h diff -u src/sys/arch/prep/include/isa_machdep.h:1.12 src/sys/arch/prep/include/isa_machdep.h:1.13 --- src/sys/arch/prep/include/isa_machdep.h:1.12 Wed Aug 19 14:41:25 2009 +++ src/sys/arch/prep/include/isa_machdep.h Wed Aug 19 15:02:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.12 2009/08/19 14:41:25 dyoung Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.13 2009/08/19 15:02:05 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -49,8 +49,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) -#define isa_detach_hook(s) \ - genppc_isa_detach_hook(s) +#define isa_detach_hook(c, s) \ + genppc_isa_detach_hook(c, s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/ofppc/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 15:01:46 UTC 2009 Modified Files: src/sys/arch/ofppc/include: isa_machdep.h Log Message: isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ofppc/include/isa_machdep.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/ofppc/include/isa_machdep.h diff -u src/sys/arch/ofppc/include/isa_machdep.h:1.6 src/sys/arch/ofppc/include/isa_machdep.h:1.7 --- src/sys/arch/ofppc/include/isa_machdep.h:1.6 Wed Aug 19 14:40:36 2009 +++ src/sys/arch/ofppc/include/isa_machdep.h Wed Aug 19 15:01:46 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.6 2009/08/19 14:40:36 dyoung Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:01:46 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -46,8 +46,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) -#define isa_detach_hook(s) \ - genppc_isa_detach_hook(s) +#define isa_detach_hook(c, s) \ + genppc_isa_detach_hook(c, s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/ibmnws/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 15:01:31 UTC 2009 Modified Files: src/sys/arch/ibmnws/include: isa_machdep.h Log Message: isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ibmnws/include/isa_machdep.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/ibmnws/include/isa_machdep.h diff -u src/sys/arch/ibmnws/include/isa_machdep.h:1.5 src/sys/arch/ibmnws/include/isa_machdep.h:1.6 --- src/sys/arch/ibmnws/include/isa_machdep.h:1.5 Wed Aug 19 14:37:24 2009 +++ src/sys/arch/ibmnws/include/isa_machdep.h Wed Aug 19 15:01:30 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.5 2009/08/19 14:37:24 dyoung Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.6 2009/08/19 15:01:30 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -49,8 +49,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) -#define isa_detach_hook(s) \ - genppc_isa_detach_hook(s) +#define isa_detach_hook(c, s) \ + genppc_isa_detach_hook(c, s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:01:07 UTC 2009
Modified Files:
src/sys/arch/arm/footbridge/isa: isa_machdep.c
src/sys/arch/arm/include: isa_machdep.h
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/footbridge/isa/isa_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/include/isa_machdep.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/arm/footbridge/isa/isa_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.14 src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.15
--- src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.14 Tue Aug 18 17:02:00 2009
+++ src/sys/arch/arm/footbridge/isa/isa_machdep.c Wed Aug 19 15:01:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.14 2009/08/18 17:02:00 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.15 2009/08/19 15:01:07 dyoung Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.14 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.15 2009/08/19 15:01:07 dyoung Exp $");
#include "opt_irqstats.h"
@@ -501,7 +501,7 @@
}
void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
#if NISADMA > 0
isa_dma_destroy();
Index: src/sys/arch/arm/include/isa_machdep.h
diff -u src/sys/arch/arm/include/isa_machdep.h:1.6 src/sys/arch/arm/include/isa_machdep.h:1.7
--- src/sys/arch/arm/include/isa_machdep.h:1.6 Wed Aug 19 14:35:45 2009
+++ src/sys/arch/arm/include/isa_machdep.h Wed Aug 19 15:01:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.6 2009/08/19 14:35:45 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:01:07 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
void isa_attach_hook(struct device *, struct device *,
struct isabus_attach_args *);
-void isa_detach_hook(device_t);
+void isa_detach_hook(isa_chipset_tag_t, device_t);
const struct evcnt *isa_intr_evcnt(isa_chipset_tag_t ic, int irq);
void *isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
int level, int (*ih_fun)(void *), void *ih_arg);
CVS commit: src/sys/arch/bebox/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 15:00:46 UTC 2009 Modified Files: src/sys/arch/bebox/include: isa_machdep.h Log Message: isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/bebox/include/isa_machdep.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/bebox/include/isa_machdep.h diff -u src/sys/arch/bebox/include/isa_machdep.h:1.19 src/sys/arch/bebox/include/isa_machdep.h:1.20 --- src/sys/arch/bebox/include/isa_machdep.h:1.19 Wed Aug 19 14:32:26 2009 +++ src/sys/arch/bebox/include/isa_machdep.h Wed Aug 19 15:00:46 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.19 2009/08/19 14:32:26 dyoung Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.20 2009/08/19 15:00:46 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -49,8 +49,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) -#define isa_detach_hook(s) \ - genppc_isa_detach_hook(s) +#define isa_detach_hook(c, s) \ + genppc_isa_detach_hook(c, s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/alpha
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 15:00:24 UTC 2009
Modified Files:
src/sys/arch/alpha/include: isa_machdep.h
src/sys/arch/alpha/jensenio: jensenio.c
src/sys/arch/alpha/pci: sio.c
Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/include/isa_machdep.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/jensenio/jensenio.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/alpha/pci/sio.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/alpha/include/isa_machdep.h
diff -u src/sys/arch/alpha/include/isa_machdep.h:1.10 src/sys/arch/alpha/include/isa_machdep.h:1.11
--- src/sys/arch/alpha/include/isa_machdep.h:1.10 Wed Aug 19 14:29:53 2009
+++ src/sys/arch/alpha/include/isa_machdep.h Wed Aug 19 15:00:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.10 2009/08/19 14:29:53 dyoung Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.11 2009/08/19 15:00:23 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -83,8 +83,8 @@
*/
#define isa_attach_hook(p, s, a) \
(*(a)->iba_ic->ic_attach_hook)((p), (s), (a))
-#define isa_detach_hook(s) \
-(*(a)->iba_ic->ic_detach_hook)((s))
+#define isa_detach_hook(c, s) \
+(*(c)->ic_detach_hook)((c), (s))
#define isa_intr_evcnt(c, i) \
(*(c)->ic_intr_evcnt)((c)->ic_v, (i))
#define isa_intr_establish(c, i, t, l, f, a)\
Index: src/sys/arch/alpha/jensenio/jensenio.c
diff -u src/sys/arch/alpha/jensenio/jensenio.c:1.18 src/sys/arch/alpha/jensenio/jensenio.c:1.19
--- src/sys/arch/alpha/jensenio/jensenio.c:1.18 Wed Aug 19 14:29:53 2009
+++ src/sys/arch/alpha/jensenio/jensenio.c Wed Aug 19 15:00:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio.c,v 1.18 2009/08/19 14:29:53 dyoung Exp $ */
+/* $NetBSD: jensenio.c,v 1.19 2009/08/19 15:00:24 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.18 2009/08/19 14:29:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.19 2009/08/19 15:00:24 dyoung Exp $");
#include
#include
@@ -97,7 +97,7 @@
static void jensenio_isa_attach_hook(device_t, device_t,
struct isabus_attach_args *);
-static void jensenio_isa_detach_hook(device_t);
+static void jensenio_isa_detach_hook(isa_chipset_tag_t, device_t);
/*
* Set up the Jensen's function pointers.
@@ -259,7 +259,7 @@
}
static void
-jensenio_isa_detach_hook(device_t self)
+jensenio_isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
/* Nothing to do. */
Index: src/sys/arch/alpha/pci/sio.c
diff -u src/sys/arch/alpha/pci/sio.c:1.47 src/sys/arch/alpha/pci/sio.c:1.48
--- src/sys/arch/alpha/pci/sio.c:1.47 Wed Aug 19 14:29:54 2009
+++ src/sys/arch/alpha/pci/sio.c Wed Aug 19 15:00:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.47 2009/08/19 14:29:54 dyoung Exp $ */
+/* $NetBSD: sio.c,v 1.48 2009/08/19 15:00:24 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.47 2009/08/19 14:29:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.48 2009/08/19 15:00:24 dyoung Exp $");
#include
#include
@@ -125,7 +125,7 @@
void sio_isa_attach_hook(struct device *, struct device *,
struct isabus_attach_args *);
-void sio_isa_detach_hook(device_t);
+void sio_isa_detach_hook(isa_chipset_tag_t, device_t);
#if NPCEB > 0
void sio_eisa_attach_hook(struct device *, struct device *,
struct eisabus_attach_args *);
@@ -294,7 +294,7 @@
}
void
-sio_isa_detach_hook(device_t self)
+sio_isa_detach_hook(isa_chipset_tag_t ic, device_t self)
{
/* Nothing to do. */
CVS commit: src/sys
Module Name:src Committed By: thorpej Date: Wed Aug 19 14:58:48 UTC 2009 Modified Files: src/sys/arch/arm/include/arm32: pmap.h src/sys/uvm: uvm_pmap.h Log Message: Rationalize the definition of PMAP_KMPAGE. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/arm/include/arm32/pmap.h cvs rdiff -u -r1.28 -r1.29 src/sys/uvm/uvm_pmap.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/arm/include/arm32/pmap.h diff -u src/sys/arch/arm/include/arm32/pmap.h:1.90 src/sys/arch/arm/include/arm32/pmap.h:1.91 --- src/sys/arch/arm/include/arm32/pmap.h:1.90 Tue Dec 30 05:51:19 2008 +++ src/sys/arch/arm/include/arm32/pmap.h Wed Aug 19 14:58:48 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.90 2008/12/30 05:51:19 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.91 2009/08/19 14:58:48 thorpej Exp $ */ /* * Copyright (c) 2002, 2003 Wasabi Systems, Inc. @@ -290,9 +290,6 @@ #define PMAP_NEED_PROCWR #define PMAP_GROWKERNEL /* turn on pmap_growkernel interface */ -#define PMAP_KMPAGE 0x0040 /* Make uvm tell us when it allocates - a page to be used for kernel memory */ - #if ARM_MMU_V6 > 0 #define PMAP_PREFER(hint, vap, sz, td) pmap_prefer((hint), (vap), (td)) Index: src/sys/uvm/uvm_pmap.h diff -u src/sys/uvm/uvm_pmap.h:1.28 src/sys/uvm/uvm_pmap.h:1.29 --- src/sys/uvm/uvm_pmap.h:1.28 Thu Apr 23 06:22:00 2009 +++ src/sys/uvm/uvm_pmap.h Wed Aug 19 14:58:48 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_pmap.h,v 1.28 2009/04/23 06:22:00 cegger Exp $ */ +/* $NetBSD: uvm_pmap.h,v 1.29 2009/08/19 14:58:48 thorpej Exp $ */ /* * Copyright (c) 1991, 1993 @@ -96,20 +96,17 @@ * Flags passed to pmap_enter(). Note the bottom 3 bits are VM_PROT_* * bits, used to indicate the access type that was made (to seed modified * and referenced information). + * + * Flags marked [PA] are for pmap_kenter_pa() only. Flags marked [BOTH] + * apply to pmap_kenter_pa() and pmap_enter(). All other flags are valid + * for pmap_enter() only. */ #define PMAP_WIRED 0x0010 /* wired mapping */ #define PMAP_CANFAIL 0x0020 /* can fail if resource shortage */ +#define PMAP_KMPAGE 0x0040 /* [PA] page used for kernel memory */ #define PMAP_MD_MASK 0xff00 /* Machine-dependent bits */ -/* - * Flags passed to pmap_kenter_pa(). Note the bottom 3 bits are VM_PROT_* - * bits, used to indicate the access type. - */ -#ifndef PMAP_KMPAGE -#define PMAP_KMPAGE 0x /* this is from the kmem allocator */ -#endif - #ifndef PMAP_EXCLUDE_DECLS /* Used in Sparc port to virtualize pmap mod */ #ifdef _KERNEL __BEGIN_DECLS
CVS commit: src/usr.bin/rdist
Module Name:src Committed By: joerg Date: Wed Aug 19 14:54:35 UTC 2009 Modified Files: src/usr.bin/rdist: rdist.1 Log Message: Nesting displays is not valid groff syntax. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.bin/rdist/rdist.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/rdist/rdist.1 diff -u src/usr.bin/rdist/rdist.1:1.18 src/usr.bin/rdist/rdist.1:1.19 --- src/usr.bin/rdist/rdist.1:1.18 Tue Jul 13 12:02:23 2004 +++ src/usr.bin/rdist/rdist.1 Wed Aug 19 14:54:35 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: rdist.1,v 1.18 2004/07/13 12:02:23 wiz Exp $ +.\" $NetBSD: rdist.1,v 1.19 2009/08/19 14:54:35 joerg Exp $ .\" .\" Copyright (c) 1985, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -106,11 +106,11 @@ .Li -\*[Gt] .Op Ar login@ .Ar host -.Bd -filled -offset indent -compact +.Ed +.Bd -filled -offset indentindent -compact .Li install .Op Ar dest ; .Ed -.Ed .El .Pp Options common to both forms:
CVS commit: src/sys/arch/powerpc
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 14:44:48 UTC 2009
Modified Files:
src/sys/arch/powerpc/include: isa_machdep.h
src/sys/arch/powerpc/isa: isa_machdep_common.c
Log Message:
Define genppc_isa_detach_hook() and isa_dmadestroy().
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/isa_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/isa/isa_machdep_common.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/powerpc/include/isa_machdep.h
diff -u src/sys/arch/powerpc/include/isa_machdep.h:1.4 src/sys/arch/powerpc/include/isa_machdep.h:1.5
--- src/sys/arch/powerpc/include/isa_machdep.h:1.4 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/include/isa_machdep.h Wed Aug 19 14:44:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.4 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.5 2009/08/19 14:44:48 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -110,6 +110,8 @@
#define isa_dmainit(ic, bst, dmat, d) \
_isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d))
+#define isa_dmadestroy(ic) \
+ _isa_dmadestroy(&(ic)->ic_dmastate)
#define isa_dmacascade(ic, c) \
_isa_dmacascade(&(ic)->ic_dmastate, (c))
#define isa_dmamaxsize(ic, c) \
Index: src/sys/arch/powerpc/isa/isa_machdep_common.c
diff -u src/sys/arch/powerpc/isa/isa_machdep_common.c:1.3 src/sys/arch/powerpc/isa/isa_machdep_common.c:1.4
--- src/sys/arch/powerpc/isa/isa_machdep_common.c:1.3 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/isa/isa_machdep_common.c Wed Aug 19 14:44:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep_common.c,v 1.3 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: isa_machdep_common.c,v 1.4 2009/08/19 14:44:48 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep_common.c,v 1.3 2008/04/28 20:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep_common.c,v 1.4 2009/08/19 14:44:48 dyoung Exp $");
#include
#include
@@ -82,3 +82,10 @@
/* Nothing to do. */
}
+
+void
+genppc_isa_detach_hook(device_t self)
+{
+
+ /* Nothing to do. */
+}
CVS commit: src/sys/arch/sandpoint/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 14:41:57 UTC 2009 Modified Files: src/sys/arch/sandpoint/include: isa_machdep.h Log Message: Define isa_detach_hook(). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sandpoint/include/isa_machdep.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/sandpoint/include/isa_machdep.h diff -u src/sys/arch/sandpoint/include/isa_machdep.h:1.7 src/sys/arch/sandpoint/include/isa_machdep.h:1.8 --- src/sys/arch/sandpoint/include/isa_machdep.h:1.7 Mon Apr 28 20:23:34 2008 +++ src/sys/arch/sandpoint/include/isa_machdep.h Wed Aug 19 14:41:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.7 2008/04/28 20:23:34 martin Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.8 2009/08/19 14:41:57 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -43,6 +43,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) +#define isa_detach_hook(s) \ + genppc_isa_detach_hook(s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/prep/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 14:41:26 UTC 2009 Modified Files: src/sys/arch/prep/include: isa_machdep.h Log Message: Define isa_detach_hook(). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/prep/include/isa_machdep.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/prep/include/isa_machdep.h diff -u src/sys/arch/prep/include/isa_machdep.h:1.11 src/sys/arch/prep/include/isa_machdep.h:1.12 --- src/sys/arch/prep/include/isa_machdep.h:1.11 Mon Apr 28 20:23:33 2008 +++ src/sys/arch/prep/include/isa_machdep.h Wed Aug 19 14:41:25 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.11 2008/04/28 20:23:33 martin Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.12 2009/08/19 14:41:25 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -49,6 +49,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) +#define isa_detach_hook(s) \ + genppc_isa_detach_hook(s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/ofppc/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 14:40:36 UTC 2009 Modified Files: src/sys/arch/ofppc/include: isa_machdep.h Log Message: Define isa_detach_hook(). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ofppc/include/isa_machdep.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/ofppc/include/isa_machdep.h diff -u src/sys/arch/ofppc/include/isa_machdep.h:1.5 src/sys/arch/ofppc/include/isa_machdep.h:1.6 --- src/sys/arch/ofppc/include/isa_machdep.h:1.5 Mon Apr 28 20:23:30 2008 +++ src/sys/arch/ofppc/include/isa_machdep.h Wed Aug 19 14:40:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.5 2008/04/28 20:23:30 martin Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.6 2009/08/19 14:40:36 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -46,6 +46,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) +#define isa_detach_hook(s) \ + genppc_isa_detach_hook(s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/ibmnws/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 14:37:24 UTC 2009 Modified Files: src/sys/arch/ibmnws/include: isa_machdep.h Log Message: Define isa_detach_hook(). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ibmnws/include/isa_machdep.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/ibmnws/include/isa_machdep.h diff -u src/sys/arch/ibmnws/include/isa_machdep.h:1.4 src/sys/arch/ibmnws/include/isa_machdep.h:1.5 --- src/sys/arch/ibmnws/include/isa_machdep.h:1.4 Mon Apr 28 20:23:26 2008 +++ src/sys/arch/ibmnws/include/isa_machdep.h Wed Aug 19 14:37:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.4 2008/04/28 20:23:26 martin Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.5 2009/08/19 14:37:24 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -49,6 +49,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) +#define isa_detach_hook(s) \ + genppc_isa_detach_hook(s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 14:35:45 UTC 2009 Modified Files: src/sys/arch/arm/include: isa_machdep.h Log Message: Define isa_dmadestroy(). Declare isa_detach_hook(). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/include/isa_machdep.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/arm/include/isa_machdep.h diff -u src/sys/arch/arm/include/isa_machdep.h:1.5 src/sys/arch/arm/include/isa_machdep.h:1.6 --- src/sys/arch/arm/include/isa_machdep.h:1.5 Mon Apr 28 20:23:14 2008 +++ src/sys/arch/arm/include/isa_machdep.h Wed Aug 19 14:35:45 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.5 2008/04/28 20:23:14 martin Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.6 2009/08/19 14:35:45 dyoung Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -53,6 +53,7 @@ */ void isa_attach_hook(struct device *, struct device *, struct isabus_attach_args *); +void isa_detach_hook(device_t); const struct evcnt *isa_intr_evcnt(isa_chipset_tag_t ic, int irq); void *isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg); @@ -60,6 +61,8 @@ #define isa_dmainit(ic, bst, dmat, d) \ _isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d)) +#define isa_dmadestroy(ic) \ + _isa_dmadestroy(&(ic)->ic_dmastate) #define isa_dmacascade(ic, c) \ _isa_dmacascade(&(ic)->ic_dmastate, (c)) #define isa_dmamaxsize(ic, c) \
CVS commit: src/sys/arch/bebox/include
Module Name:src Committed By: dyoung Date: Wed Aug 19 14:32:27 UTC 2009 Modified Files: src/sys/arch/bebox/include: isa_machdep.h Log Message: Define isa_detach_hook() to fix bebox build. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/bebox/include/isa_machdep.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/bebox/include/isa_machdep.h diff -u src/sys/arch/bebox/include/isa_machdep.h:1.18 src/sys/arch/bebox/include/isa_machdep.h:1.19 --- src/sys/arch/bebox/include/isa_machdep.h:1.18 Mon Apr 28 20:23:15 2008 +++ src/sys/arch/bebox/include/isa_machdep.h Wed Aug 19 14:32:26 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.h,v 1.18 2008/04/28 20:23:15 martin Exp $ */ +/* $NetBSD: isa_machdep.h,v 1.19 2009/08/19 14:32:26 dyoung Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -49,6 +49,8 @@ /* function mappings */ #define isa_attach_hook(p, s, iaa) \ genppc_isa_attach_hook(p, s, iaa) +#define isa_detach_hook(s) \ + genppc_isa_detach_hook(s) #define isa_intr_evcnt(ic, irq) \ genppc_isa_intr_evcnt(ic, irq) #define isa_intr_establish(ic, irq, type, level, fun, arg) \
CVS commit: src/sys/arch/alpha
Module Name:src
Committed By: dyoung
Date: Wed Aug 19 14:29:54 UTC 2009
Modified Files:
src/sys/arch/alpha/include: isa_machdep.h
src/sys/arch/alpha/jensenio: jensenio.c
src/sys/arch/alpha/pci: sio.c
Log Message:
Define isa_dmadestroy and isa_detach_hook. Hook up a couple of
isa_detach_hook implementations.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/include/isa_machdep.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/alpha/jensenio/jensenio.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/alpha/pci/sio.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/alpha/include/isa_machdep.h
diff -u src/sys/arch/alpha/include/isa_machdep.h:1.9 src/sys/arch/alpha/include/isa_machdep.h:1.10
--- src/sys/arch/alpha/include/isa_machdep.h:1.9 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/include/isa_machdep.h Wed Aug 19 14:29:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.9 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.10 2009/08/19 14:29:53 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -83,6 +83,8 @@
*/
#define isa_attach_hook(p, s, a) \
(*(a)->iba_ic->ic_attach_hook)((p), (s), (a))
+#define isa_detach_hook(s) \
+(*(a)->iba_ic->ic_detach_hook)((s))
#define isa_intr_evcnt(c, i) \
(*(c)->ic_intr_evcnt)((c)->ic_v, (i))
#define isa_intr_establish(c, i, t, l, f, a)\
@@ -94,6 +96,8 @@
#define isa_dmainit(ic, bst, dmat, d) \
_isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d))
+#define isa_dmadestroy(ic) \
+ _isa_dmadestroy(&(ic)->ic_dmastate)
#define isa_dmacascade(ic, c) \
_isa_dmacascade(&(ic)->ic_dmastate, (c))
#define isa_dmamaxsize(ic, c) \
Index: src/sys/arch/alpha/jensenio/jensenio.c
diff -u src/sys/arch/alpha/jensenio/jensenio.c:1.17 src/sys/arch/alpha/jensenio/jensenio.c:1.18
--- src/sys/arch/alpha/jensenio/jensenio.c:1.17 Wed Jul 9 21:19:23 2008
+++ src/sys/arch/alpha/jensenio/jensenio.c Wed Aug 19 14:29:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio.c,v 1.17 2008/07/09 21:19:23 joerg Exp $ */
+/* $NetBSD: jensenio.c,v 1.18 2009/08/19 14:29:53 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.17 2008/07/09 21:19:23 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.18 2009/08/19 14:29:53 dyoung Exp $");
#include
#include
@@ -97,6 +97,8 @@
static void jensenio_isa_attach_hook(device_t, device_t,
struct isabus_attach_args *);
+static void jensenio_isa_detach_hook(device_t);
+
/*
* Set up the Jensen's function pointers.
*/
@@ -203,6 +205,7 @@
* Attach the ISA bus.
*/
jcp->jc_ic.ic_attach_hook = jensenio_isa_attach_hook;
+ jcp->jc_ic.ic_detach_hook = jensenio_isa_detach_hook;
ja.ja_isa.iba_iot = &jcp->jc_eisa_iot;
ja.ja_isa.iba_memt = &jcp->jc_eisa_memt;
@@ -254,3 +257,10 @@
/* Nothing to do. */
}
+
+static void
+jensenio_isa_detach_hook(device_t self)
+{
+
+ /* Nothing to do. */
+}
Index: src/sys/arch/alpha/pci/sio.c
diff -u src/sys/arch/alpha/pci/sio.c:1.46 src/sys/arch/alpha/pci/sio.c:1.47
--- src/sys/arch/alpha/pci/sio.c:1.46 Sat Mar 14 21:04:02 2009
+++ src/sys/arch/alpha/pci/sio.c Wed Aug 19 14:29:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.46 2009/03/14 21:04:02 dsl Exp $ */
+/* $NetBSD: sio.c,v 1.47 2009/08/19 14:29:54 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.46 2009/03/14 21:04:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.47 2009/08/19 14:29:54 dyoung Exp $");
#include
#include
@@ -125,6 +125,7 @@
void sio_isa_attach_hook(struct device *, struct device *,
struct isabus_attach_args *);
+void sio_isa_detach_hook(device_t);
#if NPCEB > 0
void sio_eisa_attach_hook(struct device *, struct device *,
struct eisabus_attach_args *);
@@ -258,6 +259,7 @@
sc->sc_ic->ic_v = NULL;
sc->sc_ic->ic_attach_hook = sio_isa_attach_hook;
+ sc->sc_ic->ic_detach_hook = sio_isa_detach_hook;
/*
* Deal with platforms that hook up ISA interrupts differently.
@@ -291,6 +293,13 @@
/* Nothing to do. */
}
+void
+sio_isa_detach_hook(device_t self)
+{
+
+ /* Nothing to do. */
+}
+
#if NPCEB > 0
void
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: vanhu
Date: Wed Aug 19 13:54:07 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: remoteconf.c
Log Message:
fixed address check in rmconf_match_type(), just check address with wildcard
port
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/dist/ipsec-tools/src/racoon/remoteconf.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/dist/ipsec-tools/src/racoon/remoteconf.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.16 src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.17
--- src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.16 Wed Aug 19 12:20:02 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c Wed Aug 19 13:54:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: remoteconf.c,v 1.16 2009/08/19 12:20:02 tteras Exp $ */
+/* $NetBSD: remoteconf.c,v 1.17 2009/08/19 13:54:07 vanhu Exp $ */
/* Id: remoteconf.c,v 1.38 2006/05/06 15:52:44 manubsd Exp */
@@ -209,7 +209,7 @@
/* Check address */
if (rmsel->remote != NULL) {
if (rmconf->remote->sa_family != AF_UNSPEC) {
- if (cmpsaddr(rmsel->remote, rmconf->remote) != 0)
+ if (cmpsaddr(rmsel->remote, rmconf->remote) == CMPSADDR_MISMATCH)
return MATCH_NONE;
/* Address matched */
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Wed Aug 19 13:38:51 UTC 2009
Modified Files:
src/sys/dev/usb: pseye.c
Log Message:
s/PLAYSTATION/PlayStation/
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/pseye.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.11 src/sys/dev/usb/pseye.c:1.12
--- src/sys/dev/usb/pseye.c:1.11 Tue Feb 3 13:31:24 2009
+++ src/sys/dev/usb/pseye.c Wed Aug 19 13:38:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.11 2009/02/03 13:31:24 jmcneill Exp $ */
+/* $NetBSD: pseye.c,v 1.12 2009/08/19 13:38:51 jmcneill Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
/*
- * Sony PLAYSTATION(R) Eye Driver
+ * Sony PlayStation Eye Driver
*
* The only documentation we have for this part is based on a series
* of forum postings by Jim Paris on ps2dev.org. Many thanks for
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.11 2009/02/03 13:31:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.12 2009/08/19 13:38:51 jmcneill Exp $");
#include
#include
@@ -707,7 +707,7 @@
static const char *
pseye_get_devname(void *opaque)
{
- return "PLAYSTATION(R) Eye";
+ return "PlayStation Eye";
}
static int
CVS commit: src/share/man/man4
Module Name:src Committed By: jmcneill Date: Wed Aug 19 13:38:27 UTC 2009 Modified Files: src/share/man/man4: pseye.4 Log Message: s/PLAYSTATION/PlayStation/ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/pseye.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/pseye.4 diff -u src/share/man/man4/pseye.4:1.4 src/share/man/man4/pseye.4:1.5 --- src/share/man/man4/pseye.4:1.4 Sat Sep 6 20:12:04 2008 +++ src/share/man/man4/pseye.4 Wed Aug 19 13:38:26 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: pseye.4,v 1.4 2008/09/06 20:12:04 wiz Exp $ +.\" $NetBSD: pseye.4,v 1.5 2009/08/19 13:38:26 jmcneill Exp $ .\" .\" Copyright (c) 2008 Jared D. McNeill .\" All rights reserved. @@ -29,14 +29,14 @@ .Os .Sh NAME .Nm pseye -.Nd Sony PLAYSTATION(R) Eye webcam device driver +.Nd Sony PlayStation Eye webcam device driver .Sh SYNOPSIS .Cd "pseye* at uhub?" .Cd "video* at videobus?" .Sh DESCRIPTION The .Nm -driver provides support for the Sony PLAYSTATION(R) Eye +driver provides support for the Sony PlayStation Eye .Tn USB webcam (model SLEH-00201). .Pp @@ -45,7 +45,7 @@ .Xr ehci 4 ) to function properly. .Pp -The Sony PLAYSTATION(R) Eye device also has a separate audio interface, +The Sony PlayStation Eye device also has a separate audio interface, which is supported by the .Xr uaudio 4 device driver.
CVS commit: src/sys/dist/ipf/netinet
Module Name:src Committed By: cegger Date: Wed Aug 19 13:07:59 UTC 2009 Modified Files: src/sys/dist/ipf/netinet: ip_compat.h Log Message: build fix: caddr_t -> void * To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/dist/ipf/netinet/ip_compat.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/dist/ipf/netinet/ip_compat.h diff -u src/sys/dist/ipf/netinet/ip_compat.h:1.25 src/sys/dist/ipf/netinet/ip_compat.h:1.26 --- src/sys/dist/ipf/netinet/ip_compat.h:1.25 Wed Aug 19 08:36:10 2009 +++ src/sys/dist/ipf/netinet/ip_compat.h Wed Aug 19 13:07:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_compat.h,v 1.25 2009/08/19 08:36:10 darrenr Exp $ */ +/* $NetBSD: ip_compat.h,v 1.26 2009/08/19 13:07:59 cegger Exp $ */ /* * Copyright (C) 1993-2001, 2003 by Darren Reed. @@ -1745,7 +1745,7 @@ # define KMALLOCS(a, b, c) (a) = (b)malloc((c), _M_IPF, M_NOWAIT) # define KFREE(x) free((x), _M_IPF) # define KFREES(x,s) free((x), _M_IPF) -# define UIOMOVE(a,b,c,d) uiomove((caddr_t)a,b,d) +# define UIOMOVE(a,b,c,d) uiomove((void *)a,b,d) # define SLEEP(id, n) tsleep((id), PPAUSE|PCATCH, n, 0) # define WAKEUP(id,x) wakeup(id+x) # if !defined(POLLWAKEUP)
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: jun
Date: Wed Aug 19 12:49:24 UTC 2009
Modified Files:
src/sys/arch/hpcmips/vr: vr.c
Log Message:
Fix #41863, Missing "}".
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/hpcmips/vr/vr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.53 src/sys/arch/hpcmips/vr/vr.c:1.54
--- src/sys/arch/hpcmips/vr/vr.c:1.53 Wed Mar 18 15:14:29 2009
+++ src/sys/arch/hpcmips/vr/vr.c Wed Aug 19 12:49:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.53 2009/03/18 15:14:29 cegger Exp $ */
+/* $NetBSD: vr.c,v 1.54 2009/08/19 12:49:24 jun Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.53 2009/03/18 15:14:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.54 2009/08/19 12:49:24 jun Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -428,6 +428,7 @@
printf("%s(%d): can't init kgdb's serial port",
__FILE__, __LINE__);
}
+ }
#else /* KGDB */
if (com_info->attach != NULL && (bootinfo->bi_cnuse&BI_CNUSE_SERIAL)) {
/* Serial console */
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Wed Aug 19 12:20:02 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: remoteconf.c
Log Message:
Have an enum for rmconf_match_type() return values to make the code a bit
more readable.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/dist/ipsec-tools/src/racoon/remoteconf.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/dist/ipsec-tools/src/racoon/remoteconf.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.15 src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.16
--- src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.15 Fri Jul 3 06:41:47 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c Wed Aug 19 12:20:02 2009
@@ -1,11 +1,11 @@
-/* $NetBSD: remoteconf.c,v 1.15 2009/07/03 06:41:47 tteras Exp $ */
+/* $NetBSD: remoteconf.c,v 1.16 2009/08/19 12:20:02 tteras Exp $ */
/* Id: remoteconf.c,v 1.38 2006/05/06 15:52:44 manubsd Exp */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -17,7 +17,7 @@
* 3. Neither the name of the project nor the names of its contributors
*may be used to endorse or promote products derived from this software
*without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -81,7 +81,7 @@
static TAILQ_HEAD(_rmtree, remoteconf) rmtree, rmtree_save, rmtree_tmp;
-/*
+/*
* Script hook names and script hook paths
*/
char *script_names[SCRIPT_MAX + 1] = { "phase1_up", "phase1_down" };
@@ -182,6 +182,15 @@
return 0;
}
+enum rmconf_match_t {
+ MATCH_NONE = 0,
+ MATCH_ANONYMOUS,
+ MATCH_ADDRESS,
+ MATCH_SA,
+ MATCH_IDENTITY,
+ MATCH_AUTH_IDENTITY,
+};
+
static int
rmconf_match_type(rmsel, rmconf)
struct rmconfselector *rmsel;
@@ -192,19 +201,19 @@
/* No match at all: unwanted anonymous */
if ((rmsel->flags & GETRMCONF_F_NO_ANONYMOUS) &&
rmconf->remote->sa_family == AF_UNSPEC)
- return 0;
+ return MATCH_NONE;
if ((rmsel->flags & GETRMCONF_F_NO_PASSIVE) && rmconf->passive)
- return 0;
+ return MATCH_NONE;
/* Check address */
if (rmsel->remote != NULL) {
if (rmconf->remote->sa_family != AF_UNSPEC) {
if (cmpsaddr(rmsel->remote, rmconf->remote) != 0)
-return 0;
+return MATCH_NONE;
/* Address matched */
- ret = 2;
+ ret = MATCH_ADDRESS;
}
}
@@ -212,22 +221,22 @@
if (rmsel->etype != ISAKMP_ETYPE_NONE) {
if (rmconf_match_etype_and_approval(rmconf, rmsel->etype,
rmsel->approval) != 0)
- return 0;
- ret = 3;
+ return MATCH_NONE;
+ ret = MATCH_SA;
}
/* Check identity */
if (rmsel->identity != NULL && rmconf->verify_identifier) {
if (rmconf_match_identity(rmconf, rmsel->identity) != 0)
- return 0;
- ret = 4;
+ return MATCH_NONE;
+ ret = MATCH_IDENTITY;
}
/* Check certificate request */
if (rmsel->certificate_request != NULL) {
if (oakley_get_certtype(rmsel->certificate_request) !=
oakley_get_certtype(rmconf->mycert))
- return 0;
+ return MATCH_NONE;
if (rmsel->certificate_request->l > 1) {
vchar_t *issuer;
@@ -237,15 +246,15 @@
memcmp(rmsel->certificate_request->v + 1,
issuer->v, issuer->l) != 0) {
vfree(issuer);
-return 0;
+return MATCH_NONE;
}
vfree(issuer);
} else {
if (!rmconf->match_empty_cr)
-return 0;
+return MATCH_NONE;
}
- ret = 5;
+ ret = MATCH_AUTH_IDENTITY;
}
return ret;
@@ -316,7 +325,7 @@
if (match_type == fctx->match_type) {
/* Duplicate exact match, something is wrong */
- if (match_type >= 5)
+ if (match_type >= MATCH_AUTH_IDENTITY)
return 1;
/* Otherwise just remember that this is ambiguous match */
@@ -615,11 +624,11 @@
{
struct etypes *new;
- if (!orig)
+ if (!orig)
return NULL;
new = racoon_malloc(sizeof(struct etypes));
- if (new == NULL)
+ if (new == NULL)
return NULL;
new->type = orig->type;
@@ -879,11 +888,11 @@
prop->lifebyte);
plog(LLV_INFO, LOCATION, NULL, "\t\tdh_group %s;\n",
alg_oakley_dhdef_name(prop->dh_group));
- plog(LLV_INFO, LOCATION, NULL, "\t\tencryption_algorithm %s;\n",
+ plog(LLV_INFO, LOCATION, NULL, "\t\tencryption_algorithm %s;\n",
alg_oakley_encdef_name(prop->enctype));
- plog(LLV_INFO, LOCATION, NULL, "\t\thash_algorithm %s;\n",
+ plog(LLV_INFO, LOCATION, NULL, "\t\thash_algorithm %s;\n",
alg_oakley_hashdef_name(prop->hashtype));
- plog(LLV_INFO, LOCATION, NULL, "\t\tauthentication_method %s;\n",
+ plog(
CVS commit: src/external/gpl3/binutils/dist
Module Name:src Committed By: skrll Date: Wed Aug 19 10:55:06 UTC 2009 Modified Files: src/external/gpl3/binutils/dist/binutils/doc: Makefile.in src/external/gpl3/binutils/dist/ld: Makefile.in Log Message: Disable some more targets for provided files. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/dist/binutils/doc/Makefile.in cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/ld/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/binutils/doc/Makefile.in diff -u src/external/gpl3/binutils/dist/binutils/doc/Makefile.in:1.2 src/external/gpl3/binutils/dist/binutils/doc/Makefile.in:1.3 --- src/external/gpl3/binutils/dist/binutils/doc/Makefile.in:1.2 Wed Aug 19 07:19:30 2009 +++ src/external/gpl3/binutils/dist/binutils/doc/Makefile.in Wed Aug 19 10:55:06 2009 @@ -317,6 +317,8 @@ -rm -f libtool binutils.info: binutils.texi + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_binutils.info: binutils.texi restore=: && backupdir="$(am__leading_dot)am" && \ rm -rf $$backupdir && mkdir $$backupdir && \ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ Index: src/external/gpl3/binutils/dist/ld/Makefile.in diff -u src/external/gpl3/binutils/dist/ld/Makefile.in:1.2 src/external/gpl3/binutils/dist/ld/Makefile.in:1.3 --- src/external/gpl3/binutils/dist/ld/Makefile.in:1.2 Wed Aug 19 07:19:31 2009 +++ src/external/gpl3/binutils/dist/ld/Makefile.in Wed Aug 19 10:55:06 2009 @@ -845,6 +845,8 @@ -rm -f libtool ld.info: ld.texinfo $(ld_TEXINFOS) + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_ld.info: ld.texinfo $(ld_TEXINFOS) restore=: && backupdir="$(am__leading_dot)am" && \ rm -rf $$backupdir && mkdir $$backupdir && \ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src
Committed By: skrll
Date: Wed Aug 19 10:53:28 UTC 2009
Modified Files:
src/external/gpl3/binutils/dist/bfd: configure
Log Message:
Escape trailing whitespace so it's not lost by make(1).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/bfd/configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/configure
diff -u src/external/gpl3/binutils/dist/bfd/configure:1.2 src/external/gpl3/binutils/dist/bfd/configure:1.3
--- src/external/gpl3/binutils/dist/bfd/configure:1.2 Wed Aug 19 07:19:30 2009
+++ src/external/gpl3/binutils/dist/bfd/configure Wed Aug 19 10:53:27 2009
@@ -10837,10 +10837,10 @@
echo "$as_me: error: package version not specified" >&2;}
{ (exit 1); exit 1; }; } ;;
no) PKGVERSION= ;;
- *) PKGVERSION="($withval) " ;;
+ *) PKGVERSION="($withval)\ " ;;
esac
else
- PKGVERSION="(GNU Binutils) "
+ PKGVERSION="(GNU Binutils)\ "
fi;
CVS commit: src
Module Name:src
Committed By: martti
Date: Wed Aug 19 09:35:01 UTC 2009
Modified Files:
src/dist/ipf: README.NetBSD
src/doc: 3RDPARTY
Log Message:
IPF 4.1.33
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/ipf/README.NetBSD
cvs rdiff -u -r1.714 -r1.715 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/dist/ipf/README.NetBSD
diff -u src/dist/ipf/README.NetBSD:1.2 src/dist/ipf/README.NetBSD:1.3
--- src/dist/ipf/README.NetBSD:1.2 Mon Oct 20 12:09:15 2008
+++ src/dist/ipf/README.NetBSD Wed Aug 19 09:35:01 2009
@@ -1,5 +1,5 @@
#
-# $NetBSD: README.NetBSD,v 1.2 2008/10/20 12:09:15 martti Exp $
+# $NetBSD: README.NetBSD,v 1.3 2009/08/19 09:35:01 martti Exp $
#
# Author: Martti Kuparinen
#
@@ -34,9 +34,9 @@
###
export NETBSDUSERNAME="fixthis"
-export VERSION="4.1.31"
-export VEROLD="v4-1-29"
-export VERNEW="v4-1-31"
+export VERSION="4.1.34"
+export VEROLD="v4-1-33"
+export VERNEW="v4-1-34"
export VERTAG="`echo ${VERSION} | sed 's+\.+_+g'`"
export ORIG="${HOME}/netbsd/orig"
export WORK="${HOME}/netbsd/work"
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.714 src/doc/3RDPARTY:1.715
--- src/doc/3RDPARTY:1.714 Tue Aug 18 20:47:18 2009
+++ src/doc/3RDPARTY Wed Aug 19 09:35:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.714 2009/08/18 20:47:18 jmcneill Exp $
+# $NetBSD: 3RDPARTY,v 1.715 2009/08/19 09:35:01 martti Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -443,8 +443,8 @@
Notes:
Package: ipf
-Version: 4.1.29
-Current Vers: 4.1.31
+Version: 4.1.33
+Current Vers: 4.1.33
Maintainer: Darren Reed
Archive Site: http://coombs.anu.edu.au/~avalon/
Home Page: http://coombs.anu.edu.au/~avalon/
CVS commit: src/dist/ipf
Module Name:src Committed By: darrenr Date: Wed Aug 19 08:35:33 UTC 2009 Modified Files: src/dist/ipf: HISTORY Makefile ip_fil.c ip_lookup.c ip_lookup.h src/dist/ipf/ipsend: iptests.c sock.c src/dist/ipf/lib: load_http.c printnat.c src/dist/ipf/perl: logfilter.pl src/dist/ipf/samples: ipfilter-pb.gif src/dist/ipf/tools: ipf_y.y ipfstat.c ipmon.c ippool_y.y lexer.c Removed Files: src/dist/ipf/BSD: ipfadm-rcd src/dist/ipf/ipsend/.OLD: ip_compat.h Log Message: Update head to version 4.1.33 from vendor branch To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/dist/ipf/HISTORY cvs rdiff -u -r1.12 -r1.13 src/dist/ipf/Makefile cvs rdiff -u -r1.16 -r1.17 src/dist/ipf/ip_fil.c cvs rdiff -u -r1.6 -r1.7 src/dist/ipf/ip_lookup.c cvs rdiff -u -r1.3 -r1.4 src/dist/ipf/ip_lookup.h cvs rdiff -u -r1.1.1.1 -r0 src/dist/ipf/BSD/ipfadm-rcd cvs rdiff -u -r1.14 -r1.15 src/dist/ipf/ipsend/iptests.c cvs rdiff -u -r1.16 -r1.17 src/dist/ipf/ipsend/sock.c cvs rdiff -u -r1.1 -r0 src/dist/ipf/ipsend/.OLD/ip_compat.h cvs rdiff -u -r1.3 -r1.4 src/dist/ipf/lib/load_http.c cvs rdiff -u -r1.2 -r1.3 src/dist/ipf/lib/printnat.c cvs rdiff -u -r1.1 -r1.2 src/dist/ipf/perl/logfilter.pl cvs rdiff -u -r1.1 -r1.2 src/dist/ipf/samples/ipfilter-pb.gif cvs rdiff -u -r1.22 -r1.23 src/dist/ipf/tools/ipf_y.y cvs rdiff -u -r1.17 -r1.18 src/dist/ipf/tools/ipfstat.c cvs rdiff -u -r1.15 -r1.16 src/dist/ipf/tools/ipmon.c cvs rdiff -u -r1.3 -r1.4 src/dist/ipf/tools/ippool_y.y cvs rdiff -u -r1.13 -r1.14 src/dist/ipf/tools/lexer.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/ipf/HISTORY diff -u src/dist/ipf/HISTORY:1.25 src/dist/ipf/HISTORY:1.26 --- src/dist/ipf/HISTORY:1.25 Tue May 20 07:08:06 2008 +++ src/dist/ipf/HISTORY Wed Aug 19 08:35:30 2009 @@ -10,6 +10,146 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.33 - Release 16 August 2009 + +2838417 tru64 compile is not error free + +2837931 wrong mode selected in ipf program for hash-entries + +2828188 soft lockups on Linux + +2826168 load_http can make ippool core dump + +2825150 IPL_LOGMAX used to index some arrays + +2825084 ipv6 fragments should not be allowed past 64k + +2824713 ipfstat top output alternates between entries and nothing + +2824712 ipfstat top output is shows negative ttl + +2820965 a single bad ipv6 extension header should not impact others + +2818197 ignored fragment bits defined as being reserved + +2817667 IPv6 fragment header verification needs attention + +2817098 fr_getrulen() finds the wrong rule + +2817096 fr_rulen is unused + +2814988 4.1.32 RC5 does not compile on Tru64 5.1B-5 + +2825387 ipfilter 4-1-RELEASE won't build on RHEL 5.3 kernel 2.6.18.. + +2792185 no proxy modules are built on linux + +2787359 ipmon prints loopback name incorrectly for linux + +4.1.32 - Release 20 June 2009 + +2741019 Lingering states (Established/Listen - 5/0) in state table + +2790920 Solaris U7 breaks ipfilter compilation + +2790910 OOW issue on Solaris 10 v4.1.9 + +2706155 Reference to .symbol file missing in ipf.ko on FreeBSD/AMD64 + +2787870 4.1.32rc2 ipfstat -nio causes oops on Fedora 10 + +2785189 Networking stops on x86_64 RHEL ES4 U6 (2.6.9-67.ELsmp) + +2706137 FreeBSD/AMD64 build is still broken in 4.1.32 RC5 + +2702887 use of PBR/fastroute causes panic with ipv6 + +2657365 IPFilter 4.1.32 RC4 fails to compile on FreeBSD7/AMD64 + +2671913 regression test in7 fails to execute + +2650040 cannot compile updated kernel source for 4.10 + +2598625 parsing empty config file results in an error + +2698656 test parsing empty config files + +2597956 not all pointers in a clone are reset + +2543934 nat_t gets assigned ifp too early + +2539808 Compiling with Solaris10 patch 138889-03 fails + +2535795 No need to always bump fr_ref + +2535778 Bad IPv6 packets droped by default + +4.1.32 RC1 - Release 1 January 2009 + +2031730 4.1.31 Nat drops fragmented packets after the first + +2214661 ipf doesn't handle IPv6 fragments + +2473273 NAT removed before RST/ICMP sent + +2216500 fin_state serves no purpose + +2424604 adding random MD5 data causes panic + +2304435 Ineffecient lock usage in logging + +2216491 fin_nat serves little purpose + +1859718 IPF 4.1.28 repeated kernel panic Solaris 9 32bit + +2055619 duplicating a free'd packet will fail + +2042949 Excessive locking when creating nat_t + +2035610 nat_update does not need to get locks + +2214658 ipf mostly ignores locking in NetBSD + +1979427 Memory leak in user utilities - token never freed (rel br) + +* try to guess if SUNWspro wants -m64 + +2063742 4.1.30 breaks builds on Solaris 8 + +4.1.31 - Release 27 July 2008 + +* compiling arc4random.c is challenging on solaris 10 or solaris without gcc + +* SunOS4 doesn't have a curproc, but it does have u. + +* The fix for 2020447 generated random port numbers but
CVS commit: src/regress/sys/kern/ipf
Module Name:src Committed By: darrenr Date: Wed Aug 19 08:33:28 UTC 2009 Update of /cvsroot/src/regress/sys/kern/ipf In directory ivanova.netbsd.org:/tmp/cvs-serv22646 Log Message: Import IPFilter 4.1.33 4.1.33 - Release 16 August 2009 2837931 wrong mode selected in ipf program for hash-entries 2826168 load_http can make ippool core dump 2825150 IPL_LOGMAX used to index some arrays 2825084 ipv6 fragments should not be allowed past 64k 2824713 ipfstat top output alternates between entries and nothing 2824712 ipfstat top output is shows negative ttl 2820965 a single bad ipv6 extension header should not impact others 2818197 ignored fragment bits defined as being reserved 2817667 IPv6 fragment header verification needs attention 2817098 fr_getrulen() finds the wrong rule 2817096 fr_rulen is unused 2741019 Lingering states (Established/Listen - 5/0) in state table 2702887 use of PBR/fastroute causes panic with ipv6 2671913 regression test in7 fails to execute 2598625 parsing empty config file results in an error 2698656 test parsing empty config files 2597956 not all pointers in a clone are reset 2543934 nat_t gets assigned ifp too early 2535795 No need to always bump fr_ref 2535778 Bad IPv6 packets droped by default 2031730 4.1.31 Nat drops fragmented packets after the first 2214661 ipf does not handle IPv6 fragments 2473273 NAT removed before RST/ICMP sent 2216500 fin_state serves no purpose 2424604 adding random MD5 data causes panic 2304435 Ineffecient lock usage in logging 2216491 fin_nat serves little purpose 2055619 duplicating a free-d packet will fail 2042949 Excessive locking when creating nat_t 2035610 nat_update does not need to get locks 2214658 ipf mostly ignores locking in NetBSD 1979427 Memory leak in user utilities - token never freed (rel br) * SunOS4 does not have a curproc, but it does have u. * The fix for 2020447 generated random port numbers but not within the range specified in the map rule. Add in a regression test to verify that the "random" part works. 2020447 NAT can undo name server random port selection 1988795 NetBSD does not build with kernel malloc stats 1988782 fr_movequeue can take a short cut 1988669 first nat creation failure prevents further success 1988668 hostmap searching does not work properly * on some 64bit architectures (such as alpha), the addrfamily_t is packed differently, throwing off the calculations for adf_len * one too many READ_ENTERs in ip_sync code. * clean up fr_fastroute a little by removing some #ifdefs and pushing the code around a bit to use the same variables (NetBSD) * more recent NetBSDs use VOP related macros differently Status: Vendor Tag: DARRENR Release Tags: v4-1-33 U src/regress/sys/kern/ipf/iptest U src/regress/sys/kern/ipf/ptest C src/regress/sys/kern/ipf/Makefile U src/regress/sys/kern/ipf/README.TXT U src/regress/sys/kern/ipf/hextest U src/regress/sys/kern/ipf/nattest U src/regress/sys/kern/ipf/mtest U src/regress/sys/kern/ipf/natipftest U src/regress/sys/kern/ipf/bpftest U src/regress/sys/kern/ipf/logtest U src/regress/sys/kern/ipf/dotest U src/regress/sys/kern/ipf/intest C src/regress/sys/kern/ipf/itest U src/regress/sys/kern/ipf/dotest6 C src/regress/sys/kern/ipf/test.format U src/regress/sys/kern/ipf/mhtest U src/regress/sys/kern/ipf/vfycksum.pl U src/regress/sys/kern/ipf/input/f3 U src/regress/sys/kern/ipf/input/ni23 U src/regress/sys/kern/ipf/input/f9 U src/regress/sys/kern/ipf/input/ni4 U src/regress/sys/kern/ipf/input/ni11 U src/regress/sys/kern/ipf/input/n3 U src/regress/sys/kern/ipf/input/n9 U src/regress/sys/kern/ipf/input/ipv6.5 U src/regress/sys/kern/ipf/input/f11 U src/regress/sys/kern/ipf/input/f24 U src/regress/sys/kern/ipf/input/f16 U src/regress/sys/kern/ipf/input/n4 U src/regress/sys/kern/ipf/input/ipv6.2 U src/regress/sys/kern/ipf/input/ni16 U src/regress/sys/kern/ipf/input/n12 U src/regress/sys/kern/ipf/input/ni9 U src/regress/sys/kern/ipf/input/ni3 N src/regress/sys/kern/ipf/input/n18 U src/regress/sys/kern/ipf/input/f4 U src/regress/sys/kern/ipf/input/ni7 U src/regress/sys/kern/ipf/input/n16 U src/regress/sys/kern/ipf/input/ni20 U src/regress/sys/kern/ipf/input/p3 U src/regress/sys/kern/ipf/input/ni12 U src/regress/sys/kern/ipf/input/l1 U src/regress/sys/kern/ipf/input/f18 U src/regress/sys/kern/ipf/input/f12 C src/regress/sys/kern/ipf/input/ipv6.6 U src/regress/sys/kern/ipf/input/f20 C src/regress/sys/kern/ipf/input/ipv6.1 U src/regress/sys/kern/ipf/input/n7 U src/regress/sys/kern/ipf/input/f15 U src/regress/sys/kern/ipf/input/ni15 U src/regress/sys/kern/ipf/input/ip2.data U src/regress/sys/kern/ipf/input/f7 U src/regress/sys/kern/ipf/input/n11 U src/regress/sys/kern/ipf/input/ni17 U src/regress/sys/kern/ipf/input/ni2 U src/regress/sys/kern/ipf/input/ni8 U src/regress/sys/kern/ipf/input/n13 U src/regress/sys/kern/ipf/input/f5 U src/regress/sys/kern/ipf/input/f17 U src/regress/sys/kern/ipf/input/ipv6.3 U src/regress/sys/kern/ipf/input/n5 U src/regress/sys/kern/i
CVS commit: src/sys/dist/ipf
Module Name:src Committed By: darrenr Date: Wed Aug 19 08:31:59 UTC 2009 Update of /cvsroot/src/sys/dist/ipf In directory ivanova.netbsd.org:/tmp/cvs-serv26289 Log Message: Import IPFilter 4.1.33 4.1.33 - Release 16 August 2009 2837931 wrong mode selected in ipf program for hash-entries 2826168 load_http can make ippool core dump 2825150 IPL_LOGMAX used to index some arrays 2825084 ipv6 fragments should not be allowed past 64k 2824713 ipfstat top output alternates between entries and nothing 2824712 ipfstat top output is shows negative ttl 2820965 a single bad ipv6 extension header should not impact others 2818197 ignored fragment bits defined as being reserved 2817667 IPv6 fragment header verification needs attention 2817098 fr_getrulen() finds the wrong rule 2817096 fr_rulen is unused 2741019 Lingering states (Established/Listen - 5/0) in state table 2702887 use of PBR/fastroute causes panic with ipv6 2671913 regression test in7 fails to execute 2598625 parsing empty config file results in an error 2698656 test parsing empty config files 2597956 not all pointers in a clone are reset 2543934 nat_t gets assigned ifp too early 2535795 No need to always bump fr_ref 2535778 Bad IPv6 packets droped by default 2031730 4.1.31 Nat drops fragmented packets after the first 2214661 ipf does not handle IPv6 fragments 2473273 NAT removed before RST/ICMP sent 2216500 fin_state serves no purpose 2424604 adding random MD5 data causes panic 2304435 Ineffecient lock usage in logging 2216491 fin_nat serves little purpose 2055619 duplicating a free-d packet will fail 2042949 Excessive locking when creating nat_t 2035610 nat_update does not need to get locks 2214658 ipf mostly ignores locking in NetBSD 1979427 Memory leak in user utilities - token never freed (rel br) * SunOS4 does not have a curproc, but it does have u. * The fix for 2020447 generated random port numbers but not within the range specified in the map rule. Add in a regression test to verify that the "random" part works. 2020447 NAT can undo name server random port selection 1988795 NetBSD does not build with kernel malloc stats 1988782 fr_movequeue can take a short cut 1988669 first nat creation failure prevents further success 1988668 hostmap searching does not work properly * on some 64bit architectures (such as alpha), the addrfamily_t is packed differently, throwing off the calculations for adf_len * one too many READ_ENTERs in ip_sync code. * clean up fr_fastroute a little by removing some #ifdefs and pushing the code around a bit to use the same variables (NetBSD) * more recent NetBSDs use VOP related macros differently Status: Vendor Tag: DARRENR Release Tags: v4-1-33 C src/sys/dist/ipf/netinet/ip_auth.c C src/sys/dist/ipf/netinet/ip_htable.c C src/sys/dist/ipf/netinet/ip_pool.c C src/sys/dist/ipf/netinet/ip_state.c C src/sys/dist/ipf/netinet/ip_irc_pxy.c C src/sys/dist/ipf/netinet/ip_ftp_pxy.c C src/sys/dist/ipf/netinet/ip_ipsec_pxy.c U src/sys/dist/ipf/netinet/ip_sync.h C src/sys/dist/ipf/netinet/ipl.h C src/sys/dist/ipf/netinet/ip_frag.c C src/sys/dist/ipf/netinet/ip_log.c U src/sys/dist/ipf/netinet/ip_netbios_pxy.c U src/sys/dist/ipf/netinet/ip_scan.h C src/sys/dist/ipf/netinet/fil.c C src/sys/dist/ipf/netinet/ip_nat.h C src/sys/dist/ipf/netinet/ip_fil.h C src/sys/dist/ipf/netinet/ip_lookup.c C src/sys/dist/ipf/netinet/ip_proxy.c C src/sys/dist/ipf/netinet/ip_rcmd_pxy.c C src/sys/dist/ipf/netinet/ip_pptp_pxy.c C src/sys/dist/ipf/netinet/ip_sync.c U src/sys/dist/ipf/netinet/ip_auth.h U src/sys/dist/ipf/netinet/ip_htable.h U src/sys/dist/ipf/netinet/ip_pool.h C src/sys/dist/ipf/netinet/ip_state.h C src/sys/dist/ipf/netinet/ip_fil_netbsd.c C src/sys/dist/ipf/netinet/ip_h323_pxy.c C src/sys/dist/ipf/netinet/ip_lookup.h U src/sys/dist/ipf/netinet/ip_proxy.h U src/sys/dist/ipf/netinet/ip_scan.c C src/sys/dist/ipf/netinet/ip_nat.c C src/sys/dist/ipf/netinet/ip_frag.h C src/sys/dist/ipf/netinet/ip_rpcb_pxy.c C src/sys/dist/ipf/netinet/ip_raudio_pxy.c C src/sys/dist/ipf/netinet/ip_compat.h 27 conflicts created by this import. Use the following command to help the merge: cvs checkout -jDARRENR:yesterday -jDARRENR src/sys/dist/ipf
CVS commit: src/dist/ipf
Module Name:src Committed By: darrenr Date: Wed Aug 19 08:30:12 UTC 2009 Update of /cvsroot/src/dist/ipf In directory ivanova.netbsd.org:/tmp/cvs-serv13495 Log Message: Import IPFilter 4.1.33 4.1.33 - Release 16 August 2009 2837931 wrong mode selected in ipf program for hash-entries 2826168 load_http can make ippool core dump 2825150 IPL_LOGMAX used to index some arrays 2825084 ipv6 fragments should not be allowed past 64k 2824713 ipfstat top output alternates between entries and nothing 2824712 ipfstat top output is shows negative ttl 2820965 a single bad ipv6 extension header should not impact others 2818197 ignored fragment bits defined as being reserved 2817667 IPv6 fragment header verification needs attention 2817098 fr_getrulen() finds the wrong rule 2817096 fr_rulen is unused 2741019 Lingering states (Established/Listen - 5/0) in state table 2702887 use of PBR/fastroute causes panic with ipv6 2671913 regression test in7 fails to execute 2598625 parsing empty config file results in an error 2698656 test parsing empty config files 2597956 not all pointers in a clone are reset 2543934 nat_t gets assigned ifp too early 2535795 No need to always bump fr_ref 2535778 Bad IPv6 packets droped by default 2031730 4.1.31 Nat drops fragmented packets after the first 2214661 ipf does not handle IPv6 fragments 2473273 NAT removed before RST/ICMP sent 2216500 fin_state serves no purpose 2424604 adding random MD5 data causes panic 2304435 Ineffecient lock usage in logging 2216491 fin_nat serves little purpose 2055619 duplicating a free-d packet will fail 2042949 Excessive locking when creating nat_t 2035610 nat_update does not need to get locks 2214658 ipf mostly ignores locking in NetBSD 1979427 Memory leak in user utilities - token never freed (rel br) * SunOS4 does not have a curproc, but it does have u. * The fix for 2020447 generated random port numbers but not within the range specified in the map rule. Add in a regression test to verify that the "random" part works. 2020447 NAT can undo name server random port selection 1988795 NetBSD does not build with kernel malloc stats 1988782 fr_movequeue can take a short cut 1988669 first nat creation failure prevents further success 1988668 hostmap searching does not work properly * on some 64bit architectures (such as alpha), the addrfamily_t is packed differently, throwing off the calculations for adf_len * one too many READ_ENTERs in ip_sync code. * clean up fr_fastroute a little by removing some #ifdefs and pushing the code around a bit to use the same variables (NetBSD) * more recent NetBSDs use VOP related macros differently Status: Vendor Tag: DARRENR Release Tags: v4-1-33 U src/dist/ipf/mlf_rule.c C src/dist/ipf/ip_proxy.c C src/dist/ipf/ip_fil_freebsd.c C src/dist/ipf/ip_h323_pxy.c U src/dist/ipf/README U src/dist/ipf/ip_htable.c C src/dist/ipf/linux.c U src/dist/ipf/pcap-ipf.h U src/dist/ipf/ml_ipl.c U src/dist/ipf/mlfk_rule.c U src/dist/ipf/BugReport U src/dist/ipf/ip_sync.c U src/dist/ipf/ipmon.h C src/dist/ipf/ip_fil_solaris.c N src/dist/ipf/arc4random.c U src/dist/ipf/QNX_OCL.txt U src/dist/ipf/mlso_rule.c U src/dist/ipf/ip_pool.h U src/dist/ipf/ip_pptp_pxy.c U src/dist/ipf/mls_rule.c C src/dist/ipf/ip_fil.c U src/dist/ipf/radix_ipf.h C src/dist/ipf/ip_nat.c U src/dist/ipf/ip_auth.h U src/dist/ipf/bpf_filter.c C src/dist/ipf/ip_ftp_pxy.c U src/dist/ipf/mlo_rule.c C src/dist/ipf/ip_fil_osf.c U src/dist/ipf/ip_scan.c U src/dist/ipf/IPFILTER.LICENCE U src/dist/ipf/Y2K U src/dist/ipf/snoop.h U src/dist/ipf/ip_rpcb_pxy.c U src/dist/ipf/hpux.c U src/dist/ipf/mlo_ipl.c U src/dist/ipf/md5.c C src/dist/ipf/ip_fil_sunos4.c U src/dist/ipf/kmem.h U src/dist/ipf/opts.h C src/dist/ipf/ip_state.c C src/dist/ipf/HISTORY C src/dist/ipf/ip_lookup.c U src/dist/ipf/bpf-ipf.h C src/dist/ipf/mln_ipl.c C src/dist/ipf/ip_fil_hpux.c U src/dist/ipf/todo U src/dist/ipf/ip_irc_pxy.c U src/dist/ipf/ipt.h C src/dist/ipf/fil.c C src/dist/ipf/ip_fil_irix.c C src/dist/ipf/ip_frag.h U src/dist/ipf/ip_pool.c C src/dist/ipf/ip_fil.h C src/dist/ipf/ip_ipsec_pxy.c C src/dist/ipf/ip_nat.h C src/dist/ipf/ip_auth.c U src/dist/ipf/WhatsNew40.txt U src/dist/ipf/IMPORTANT C src/dist/ipf/ip_fil_netbsd.c U src/dist/ipf/mln_rule.c U src/dist/ipf/mli_ipl.c C src/dist/ipf/solaris.c U src/dist/ipf/ip_sync.h C src/dist/ipf/tru64.c C src/dist/ipf/ip_log.c U src/dist/ipf/IPF.KANJI U src/dist/ipf/ip_proxy.h U src/dist/ipf/ip_htable.h U src/dist/ipf/linux.h U src/dist/ipf/BNF C src/dist/ipf/ip_raudio_pxy.c C src/dist/ipf/ipl.h U src/dist/ipf/mls_ipl.c C src/dist/ipf/ip_rcmd_pxy.c U src/dist/ipf/radix.c C src/dist/ipf/ip_fil_openbsd.c C src/dist/ipf/ip_frag.c U src/dist/ipf/mlfk_ipl.c C src/dist/ipf/ip_state.h U src/dist/ipf/ipf.h C src/dist/ipf/Makefile C src/dist/ipf/ip_lookup.h C src/dist/ipf/ip_compat.h U src/dist/ipf/md5.h U src/dist/ipf/ip_netbios_pxy.c C src/dist/ipf/ip_fil_aix.c U src/dist/ipf/mlh_rule.c U src/dist/ipf/mlf_ipl.c U src/dist/ipf/STYL
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: he Date: Wed Aug 19 08:24:44 UTC 2009 Modified Files: src/distrib/sets/lists/comp: ad.mips md.algor md.arc md.cobalt md.evbmips md.hpcmips md.mipsco md.newsmips md.pmax md.sbmips md.sgimips Log Message: Don't remove the mips a.out entries outright, but instead mark them as obsolete, so that they will be removed from DESTDIR. Hi, m...@! To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/comp/md.algor \ src/distrib/sets/lists/comp/md.evbmips cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/comp/md.arc \ src/distrib/sets/lists/comp/md.cobalt cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/comp/md.hpcmips \ src/distrib/sets/lists/comp/md.newsmips cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/comp/md.mipsco cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/comp/md.pmax cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/comp/md.sbmips cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/comp/md.sgimips 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/ad.mips diff -u src/distrib/sets/lists/comp/ad.mips:1.35 src/distrib/sets/lists/comp/ad.mips:1.36 --- src/distrib/sets/lists/comp/ad.mips:1.35 Wed Aug 12 23:38:20 2009 +++ src/distrib/sets/lists/comp/ad.mips Wed Aug 19 08:24:43 2009 @@ -1,8 +1,11 @@ -# $NetBSD: ad.mips,v 1.35 2009/08/12 23:38:20 matt Exp $ +# $NetBSD: ad.mips,v 1.36 2009/08/19 08:24:43 he Exp $ +./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/mipscomp-c-include ./usr/include/mips/ansi.h comp-c-include +./usr/include/mips/aout_machdep.h comp-obsolete obsolete ./usr/include/mips/asm.h comp-c-include +./usr/include/mips/bsd-aout.h comp-obsolete obsolete ./usr/include/mips/bswap.h comp-c-include ./usr/include/mips/cachectl.h comp-c-include ./usr/include/mips/cdefs.h comp-c-include @@ -56,4 +59,5 @@ ./usr/include/mips/varargs.h comp-c-include ./usr/include/mips/vmparam.h comp-c-include ./usr/include/mips/wchar_limits.h comp-c-include +./usr/libdata/debug/usr/bin/elf2aout.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutil-debug debug Index: src/distrib/sets/lists/comp/md.algor diff -u src/distrib/sets/lists/comp/md.algor:1.13 src/distrib/sets/lists/comp/md.algor:1.14 --- src/distrib/sets/lists/comp/md.algor:1.13 Wed Aug 12 23:38:20 2009 +++ src/distrib/sets/lists/comp/md.algor Wed Aug 19 08:24:43 2009 @@ -1,9 +1,11 @@ -# $NetBSD: md.algor,v 1.13 2009/08/12 23:38:20 matt Exp $ +# $NetBSD: md.algor,v 1.14 2009/08/19 08:24:43 he Exp $ ./usr/include/algorcomp-c-include ./usr/include/algor/_G_config.h comp-obsolete obsolete ./usr/include/algor/ansi.h comp-c-include +./usr/include/algor/aout_machdep.h comp-obsolete obsolete ./usr/include/algor/asm.h comp-c-include ./usr/include/algor/autoconf.h comp-c-include +./usr/include/algor/bsd-aout.h comp-obsolete obsolete ./usr/include/algor/bswap.h comp-c-include ./usr/include/algor/bus.h comp-c-include ./usr/include/algor/cdefs.h comp-c-include Index: src/distrib/sets/lists/comp/md.evbmips diff -u src/distrib/sets/lists/comp/md.evbmips:1.13 src/distrib/sets/lists/comp/md.evbmips:1.14 --- src/distrib/sets/lists/comp/md.evbmips:1.13 Wed Aug 12 23:38:20 2009 +++ src/distrib/sets/lists/comp/md.evbmips Wed Aug 19 08:24:44 2009 @@ -1,8 +1,10 @@ -# $NetBSD: md.evbmips,v 1.13 2009/08/12 23:38:20 matt Exp $ +# $NetBSD: md.evbmips,v 1.14 2009/08/19 08:24:44 he Exp $ ./usr/include/evbmipscomp-c-include ./usr/include/evbmips/_G_config.h comp-obsolete obsolete ./usr/include/evbmips/ansi.h comp-c-include +./usr/include/evbmips/aout_machdep.h comp-obsolete obsolete ./usr/include/evbmips/asm.h comp-c-include +./usr/include/evbmips/bsd-aout.h comp-obsolete obsolete ./usr/include/evbmips/bswap.h comp-c-include ./usr/include/evbmips/bus.h comp-c-include ./usr/include/evbmips/cdefs.h comp-c-include Index: src/distrib/sets/lists/comp/md.arc diff -u src/distrib/sets/lists/comp/md.arc:1.22 src/distrib/sets/lists/comp/md.arc:1.23 --- src/distrib/sets/lists/comp/md.arc:1.22 Wed Aug 12 23:38:20 2009 +++ src/distrib/sets/lists/comp/md.arc Wed Aug 19 08:24:44 2009 @@ -1,9 +1,11 @@ -# $NetBSD: md.arc,v 1.22 2009/08/12 23:38:20 matt Exp $ +# $NetBSD: md.arc,v 1.23 2009/08/19 08:24:44 he Exp $ ./usr/include/arccomp-c-include ./usr/include/arc/_G_config.h comp-obsolete obsolete ./usr/include/arc/ansi.h comp-c-include +./usr/include/arc/aout_machdep.h comp-obsolete obsolete ./usr/include/arc/asm.hcomp-c-include ./usr/include/arc/autoconf.h comp-obsolete obsolete +./usr/include/arc/bsd-aout.h comp-obsolete obsolete ./usr/include/arc/bswap.h comp-c-include ./usr/include/arc/cdefs.h com
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Wed Aug 19 07:41:47 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: bus_dma.c
Log Message:
change casting pointer to u_long to uintptr_t
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.16.1 src/sys/arch/mips/mips/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.22 src/sys/arch/mips/mips/bus_dma.c:1.22.16.1
--- src/sys/arch/mips/mips/bus_dma.c:1.22 Wed Jun 4 12:41:41 2008
+++ src/sys/arch/mips/mips/bus_dma.c Wed Aug 19 07:41:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.22 2008/06/04 12:41:41 ad Exp $ */
+/* $NetBSD: bus_dma.c,v 1.22.16.1 2009/08/19 07:41:47 matt Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22 2008/06/04 12:41:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22.16.1 2009/08/19 07:41:47 matt Exp $");
#include
#include
@@ -156,7 +156,7 @@
/*
* Compute the segment size, and adjust counts.
*/
- sgsize = PAGE_SIZE - ((u_long)vaddr & PGOFSET);
+ sgsize = PAGE_SIZE - ((uintptr_t)vaddr & PGOFSET);
if (buflen < sgsize)
sgsize = buflen;
if (map->dm_maxsegsz < sgsize)
@@ -693,7 +693,7 @@
{
#ifdef DIAGNOSTIC
- if ((u_long)kva & PGOFSET)
+ if ((uintptr_t)kva & PGOFSET)
panic("_bus_dmamem_unmap: bad alignment on %p", kva);
#endif
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Wed Aug 19 07:40:10 UTC 2009 Modified Files: src/sys/arch/mips/include [matt-nb5-mips64]: asm.h Log Message: Add XXX_SCALESHIFT for all types, not just PTR REG_PROLOGUE/REG_EPILOGUE cleanup. To generate a diff of this commit: cvs rdiff -u -r1.40.38.3 -r1.40.38.4 src/sys/arch/mips/include/asm.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/mips/include/asm.h diff -u src/sys/arch/mips/include/asm.h:1.40.38.3 src/sys/arch/mips/include/asm.h:1.40.38.4 --- src/sys/arch/mips/include/asm.h:1.40.38.3 Tue Aug 18 15:25:30 2009 +++ src/sys/arch/mips/include/asm.h Wed Aug 19 07:40:10 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.40.38.3 2009/08/18 15:25:30 matt Exp $ */ +/* $NetBSD: asm.h,v 1.40.38.4 2009/08/19 07:40:10 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -423,6 +423,7 @@ #define INT_SRAV srav #define INT_LL ll #define INT_SC sc +#define INT_SCALESHIFT 2 #else #define INT_ADD dadd #define INT_ADDI daddi @@ -443,6 +444,7 @@ #define INT_SRAV dsrav #define INT_LL lld #define INT_SC scd +#define INT_SCALESHIFT 3 #endif #if _MIPS_SZLONG == 32 @@ -465,6 +467,7 @@ #define LONG_SRAV srav #define LONG_LL ll #define LONG_SC sc +#define LONG_SCALESHIFT 2 #else #define LONG_ADD dadd #define LONG_ADDI daddi @@ -485,6 +488,7 @@ #define LONG_SRAV dsrav #define LONG_LL lld #define LONG_SC scd +#define LONG_SCALESHIFT 3 #endif #if SZREG == 4 @@ -497,6 +501,7 @@ #define REG_SRLV srlv #define REG_SRA sra #define REG_SRAV srav +#define REG_SCALESHIFT 2 #else #define REG_L ld #define REG_S sd @@ -507,19 +512,16 @@ #define REG_SRLV dsrlv #define REG_SRA dsra #define REG_SRAV dsrav +#define REG_SCALESHIFT 3 #endif -#define REG_PROLOGUE .set push -#define REG_EPILOGUE .set pop - #if _MIPS_ISA == _MIPS_ISA_MIPS1 || _MIPS_ISA == _MIPS_ISA_MIPS2 || \ -_MIPS_ISA == _MIPS_ISA_MIPS32 || _MIPS_ISA == _MIPS_ISA_MIPS32R2 +_MIPS_ISA == _MIPS_ISA_MIPS32 #define MFC0 mfc0 #define MTC0 mtc0 #endif #if _MIPS_ISA == _MIPS_ISA_MIPS3 || _MIPS_ISA == _MIPS_ISA_MIPS4 || \ -_MIPS_ISA == _MIPS_ISA_MIPS5 || _MIPS_ISA == _MIPS_ISA_MIPS64 || \ -_MIPS_ISA == _MIPS_ISA_MIPS64R2 +_MIPS_ISA == _MIPS_ISA_MIPS64 #define MFC0 dmfc0 #define MTC0 dmtc0 #endif @@ -564,6 +566,10 @@ #define USE_ALT_CP(a) /* n32/n64 specific */ #endif /* __mips_o32 || __mips_o64 */ +#if defined(__mips_o32) || defined(__mips_o64) +#define REG_PROLOGUE .set push +#define REG_EPILOGUE .set pop +#endif #if defined(__mips_n32) || defined(__mips_n64) #define REG_PROLOGUE .set push ; .set mips3 #define REG_EPILOGUE .set pop
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Wed Aug 19 07:36:56 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: sig_machdep.c
Log Message:
Don't cast pointers to __greg_t because that causes warnings on N32/N64.
Use intptr_t instead (intptr_t is used to get sign extension which is
important on mips).
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.14.1 src/sys/arch/mips/mips/sig_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/mips/mips/sig_machdep.c
diff -u src/sys/arch/mips/mips/sig_machdep.c:1.16 src/sys/arch/mips/mips/sig_machdep.c:1.16.14.1
--- src/sys/arch/mips/mips/sig_machdep.c:1.16 Mon Apr 28 20:23:28 2008
+++ src/sys/arch/mips/mips/sig_machdep.c Wed Aug 19 07:36:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.16 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.16.14.1 2009/08/19 07:36:56 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.16 2008/04/28 20:23:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.16.14.1 2009/08/19 07:36:56 matt Exp $");
#include "opt_cputype.h"
#include "opt_compat_netbsd.h"
@@ -63,7 +63,7 @@
if (*onstack)
return (char *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size;
else
- return (void *)fp->f_regs[_R_SP];
+ return (void *)(intptr_t)fp->f_regs[_R_SP];
}
struct sigframe_siginfo {
@@ -133,13 +133,13 @@
* to the signal trampoline to bounce us back.
*/
tf->f_regs[_R_A0] = sig;
- tf->f_regs[_R_A1] = (__greg_t)&fp->sf_si;
- tf->f_regs[_R_A2] = (__greg_t)&fp->sf_uc;
+ tf->f_regs[_R_A1] = (intptr_t)&fp->sf_si;
+ tf->f_regs[_R_A2] = (intptr_t)&fp->sf_uc;
- tf->f_regs[_R_PC] = (__greg_t)catcher;
- tf->f_regs[_R_T9] = (__greg_t)catcher;
- tf->f_regs[_R_SP] = (__greg_t)fp;
- tf->f_regs[_R_RA] = (__greg_t)ps->sa_sigdesc[sig].sd_tramp;
+ tf->f_regs[_R_PC] = (intptr_t)catcher;
+ tf->f_regs[_R_T9] = (intptr_t)catcher;
+ tf->f_regs[_R_SP] = (intptr_t)fp;
+ tf->f_regs[_R_RA] = (intptr_t)ps->sa_sigdesc[sig].sd_tramp;
/* Remember that we're now on the signal stack. */
if (onstack)
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/sibyte/dev
Module Name:src Committed By: matt Date: Wed Aug 19 07:33:31 UTC 2009 Modified Files: src/sys/arch/mips/sibyte/dev [matt-nb5-mips64]: sbmac.c Log Message: mtod(m, unsigned int) makes gcc unhappy on _LP64. Use uintptr_t instead. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.24.1 src/sys/arch/mips/sibyte/dev/sbmac.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/mips/sibyte/dev/sbmac.c diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.28 src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.1 --- src/sys/arch/mips/sibyte/dev/sbmac.c:1.28 Thu Feb 7 01:21:52 2008 +++ src/sys/arch/mips/sibyte/dev/sbmac.c Wed Aug 19 07:33:30 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sbmac.c,v 1.28 2008/02/07 01:21:52 dyoung Exp $ */ +/* $NetBSD: sbmac.c,v 1.28.24.1 2009/08/19 07:33:30 matt Exp $ */ /* * Copyright 2000, 2001, 2004 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.28 2008/02/07 01:21:52 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.28.24.1 2009/08/19 07:33:30 matt Exp $"); #include "bpfilter.h" #include "opt_inet.h" @@ -626,7 +626,7 @@ d->sbdma_dscrtable[dsc].dscr_b = V_DMA_DSCRB_OPTIONS(K_DMA_ETHTX_APPENDCRC_APPENDPAD) | V_DMA_DSCRB_A_SIZE((m->m_len + - (mtod(m,unsigned int) & 0x001F))) | + (mtod(m,uintptr_t) & 0x001F))) | V_DMA_DSCRB_PKT_SIZE_MSB((m->m_pkthdr.len & 0xc000) >> 14) | V_DMA_DSCRB_PKT_SIZE(m->m_pkthdr.len & 0x3fff);
CVS commit: [matt-nb5-mips64] src/include
Module Name:src Committed By: matt Date: Wed Aug 19 07:02:31 UTC 2009 Modified Files: src/include [matt-nb5-mips64]: setjmp.h Log Message: Add a _BSD_JBSLOT_T_ which can be defined in if you need a wider type than "long". To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.20.1 src/include/setjmp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/setjmp.h diff -u src/include/setjmp.h:1.24 src/include/setjmp.h:1.24.20.1 --- src/include/setjmp.h:1.24 Mon Dec 24 17:26:09 2007 +++ src/include/setjmp.h Wed Aug 19 07:02:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: setjmp.h,v 1.24 2007/12/24 17:26:09 perry Exp $ */ +/* $NetBSD: setjmp.h,v 1.24.20.1 2009/08/19 07:02:31 matt Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -47,13 +47,16 @@ #define _JB_ATTRIBUTES /**/ #else #endif +#ifndef _BSD_JBSLOT_T_ +#define _BSD_JBSLOT_T_ long +#endif #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \ defined(_NETBSD_SOURCE) -typedef long sigjmp_buf[_JBLEN + 1] _JB_ATTRIBUTES; +typedef _BSD_JBSLOT_T_ sigjmp_buf[_JBLEN + 1] _JB_ATTRIBUTES; #endif /* not ANSI */ -typedef long jmp_buf[_JBLEN] _JB_ATTRIBUTES; +typedef _BSD_JBSLOT_T_ jmp_buf[_JBLEN] _JB_ATTRIBUTES; #include
