date:20100225

CVS commit: src/external/bsd/tre/agrep

2010-02-25 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Thu Feb 25 08:06:43 UTC 2010

Added Files:
src/external/bsd/tre/agrep: Makefile agrep.1

Log Message:
add reachover logic for agrep - an approximate grep program which uses
the newly added libtre, which is the free and portable approximate
regex matching library.

the manual page is not yet in standard format


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/tre/agrep/Makefile \
src/external/bsd/tre/agrep/agrep.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/lib/libcurses

2010-02-25 Thread Matthias Drochner

Module Name:src
Committed By:   drochner
Date:   Thu Feb 25 10:56:25 UTC 2010

Modified Files:
src/lib/libcurses: acs.c

Log Message:
fix wrong widechar assignment for up arrow


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libcurses/acs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-5] src/sys/dev/pci

2010-02-25 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Thu Feb 25 10:59:58 UTC 2010

Modified Files:
src/sys/dev/pci [netbsd-5]: if_wm.c if_wmvar.h

Log Message:
Fix regression caused by pullup #1277 requested by msaitoh.


To generate a diff of this commit:
cvs rdiff -u -r1.162.4.12 -r1.162.4.13 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.2.46.2 -r1.2.46.3 src/sys/dev/pci/if_wmvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-5] src/doc

2010-02-25 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Thu Feb 25 11:03:33 UTC 2010

Modified Files:
src/doc [netbsd-5]: CHANGES-5.1

Log Message:
Fix regression with i80003 caused by ticket #1277


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.200 -r1.1.2.201 src/doc/CHANGES-5.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/cddl/osnet/dist/uts/common/dtrace

2010-02-25 Thread Darran Hunt

Module Name:src
Committed By:   darran
Date:   Thu Feb 25 11:12:02 UTC 2010

Modified Files:
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c

Log Message:
DTrace: fix a problem with the code waiting for the deadman thread to exit
- now it does actually wait for it to exit.  Thanks to Frank Kardel for
spotting this.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev

2010-02-25 Thread Matthias Drochner

Module Name:src
Committed By:   drochner
Date:   Thu Feb 25 11:20:10 UTC 2010

Modified Files:
src/sys/dev/ic: pcdisplay_chars.c vga.c
src/sys/dev/wscons: unicode.h wsemul_vt100_chars.c

Log Message:
retire our private definitions for the scan1/3/5/7/9 DEC graphics
symbols, use the unicode definitions instead (which apparently didn't
exist when I wrote that)


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/pcdisplay_chars.c
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/wscons/unicode.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/wscons/wsemul_vt100_chars.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/man/man9

2010-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Feb 25 12:56:37 UTC 2010

Modified Files:
src/share/man/man9: pmf.9

Log Message:
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/share/man/man9/pmf.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/man/man9

2010-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Feb 25 12:58:18 UTC 2010

Modified Files:
src/share/man/man9: sysmon_envsys.9

Log Message:
Avoid marking up punctuation.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/share/man/man9/sysmon_envsys.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/tre/agrep

2010-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Feb 25 13:05:11 UTC 2010

Modified Files:
src/external/bsd/tre/agrep: agrep.1

Log Message:
New sentence, new line. (more to come).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/tre/agrep/agrep.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sbin/newfs_ext2fs

2010-02-25 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Thu Feb 25 13:09:17 UTC 2010

Modified Files:
src/sbin/newfs_ext2fs: newfs_ext2fs.8

Log Message:
Avoid line break in `Linux Ext2' strings.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sbin/newfs_ext2fs/newfs_ext2fs.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/tre/agrep

2010-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Feb 25 13:51:44 UTC 2010

Modified Files:
src/external/bsd/tre/agrep: agrep.1

Log Message:
Convert to mdoc.
XXX: license should be added to file.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tre/agrep/agrep.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/pci

2010-02-25 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Thu Feb 25 15:07:06 UTC 2010

Modified Files:
src/sys/dev/pci: if_wm.c if_wmvar.h

Log Message:
 Merge if_wm.c rev. 1.162.4.13 and if_wmvar.h rev. 1.2.46.3 into maintrunk.
Increase the timeout value to prevent timeout on 80003. The values are taken
from Intel's e1000 driver. Tested by spz and me.


To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_wmvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/fs/udf

2010-02-25 Thread Reinoud Zandijk

Module Name:src
Committed By:   reinoud
Date:   Thu Feb 25 16:15:58 UTC 2010

Modified Files:
src/sys/fs/udf: udf.h udf_allocation.c udf_subr.c udf_subr.h

Log Message:
First part of shrinking/growing metadata partition support:

- extending the metadata partition

Still to follow:
- sparsify metadata partition
- growing the metadata partition
- unsparsifying metadata partition


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/fs/udf/udf.h
cvs rdiff -u -r1.27 -r1.28 src/sys/fs/udf/udf_allocation.c
cvs rdiff -u -r1.103 -r1.104 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.17 -r1.18 src/sys/fs/udf/udf_subr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/cddl/osnet/dist/uts/common/dtrace

2010-02-25 Thread Darran Hunt

Module Name:src
Committed By:   darran
Date:   Thu Feb 25 16:49:19 UTC 2010

Modified Files:
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c

Log Message:
DTrace: okay *really* fix the deadman exit handling.  No need for that
over-complicated handshake. Fixes a lockdebug mutex held issue.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: src/share/man/man4 vs crash(8)

2010-02-25 Thread Thomas Klausner

On Mon, Feb 22, 2010 at 05:07:58AM -0800, Paul Goyette wrote:
 Looks to me like we already have an MI crash(8):
 
 {325} cd src/distrib/sets/lists/
 {326} find . -name mi | xargs grep crash.0
 ./man/mi:./usr/share/man/cat8/crash.0   man-sysutil-catman
  .cat
 ./man/mi:./usr/share/man/cat8/hp300/crash.0 man-sys-catman
  .cat
 ./man/mi:./usr/share/man/cat8/vax/crash.0   man-sys-catman
  .cat

Well, as you quote, we have too many :)
Perhaps the content of the hp300 and vax ones can be moved somewhere
else?
 Thomas

CVS commit: src/include

2010-02-25 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Thu Feb 25 18:37:13 UTC 2010

Modified Files:
src/include: err.h stdio.h stdlib.h util.h
src/include/ssp: stdio.h

Log Message:
Consistently use __printflike and __scanflike.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/include/err.h
cvs rdiff -u -r1.75 -r1.76 src/include/stdio.h
cvs rdiff -u -r1.90 -r1.91 src/include/stdlib.h
cvs rdiff -u -r1.54 -r1.55 src/include/util.h
cvs rdiff -u -r1.3 -r1.4 src/include/ssp/stdio.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/err.h
diff -u src/include/err.h:1.14 src/include/err.h:1.15
--- src/include/err.h:1.14	Thu Feb  3 04:39:32 2005
+++ src/include/err.h	Thu Feb 25 18:37:12 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: err.h,v 1.14 2005/02/03 04:39:32 perry Exp $	*/
+/*	$NetBSD: err.h,v 1.15 2010/02/25 18:37:12 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -46,21 +46,21 @@
 
 __BEGIN_DECLS
 __dead void	err(int, const char *, ...)
-		__attribute__((__noreturn__, __format__(__printf__, 2, 3)));
+		 __printflike(2, 3) __dead;
 __dead void	verr(int, const char *, _BSD_VA_LIST_)
-		__attribute__((__noreturn__, __format__(__printf__, 2, 0)));
+		__printflike(2, 0) __dead;
 __dead void	errx(int, const char *, ...)
-		__attribute__((__noreturn__, __format__(__printf__, 2, 3)));
+		 __printflike(2, 3) __dead;
 __dead void	verrx(int, const char *, _BSD_VA_LIST_)
-		__attribute__((__noreturn__, __format__(__printf__, 2, 0)));
+		__printflike(2, 0) __dead;
 void		warn(const char *, ...)
-		__attribute__((__format__(__printf__, 1, 2)));
+		__printflike(1, 2);
 void		vwarn(const char *, _BSD_VA_LIST_)
-		__attribute__((__format__(__printf__, 1, 0)));
+		__printflike(1, 0);
 void		warnx(const char *, ...)
-		__attribute__((__format__(__printf__, 1, 2)));
+		__printflike(1, 2);
 void		vwarnx(const char *, _BSD_VA_LIST_)
-		__attribute__((__format__(__printf__, 1, 0)));
+		__printflike(1, 0);
 __END_DECLS
 
 #endif /* !_ERR_H_ */

Index: src/include/stdio.h
diff -u src/include/stdio.h:1.75 src/include/stdio.h:1.76
--- src/include/stdio.h:1.75	Mon Jan 11 20:39:29 2010
+++ src/include/stdio.h	Thu Feb 25 18:37:12 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.75 2010/01/11 20:39:29 joerg Exp $	*/
+/*	$NetBSD: stdio.h,v 1.76 2010/02/25 18:37:12 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -226,14 +226,14 @@
 char	*fgets(char * __restrict, int, FILE * __restrict);
 FILE	*fopen(const char * __restrict , const char * __restrict);
 int	 fprintf(FILE * __restrict , const char * __restrict, ...)
-__attribute__((__format__(__printf__, 2, 3)));
+		__printflike(2, 3);
 int	 fputc(int, FILE *);
 int	 fputs(const char * __restrict, FILE * __restrict);
 size_t	 fread(void * __restrict, size_t, size_t, FILE * __restrict);
 FILE	*freopen(const char * __restrict, const char * __restrict,
 	FILE * __restrict);
 int	 fscanf(FILE * __restrict, const char * __restrict, ...)
-__attribute__((__format__(__scanf__, 2, 3)));
+		__scanflike(2, 3);
 int	 fseek(FILE *, long, int);
 int	 fsetpos(FILE *, const fpos_t *);
 long	 ftell(FILE *);
@@ -245,33 +245,33 @@
 ssize_t	 getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
 void	 perror(const char *);
 int	 printf(const char * __restrict, ...)
-__attribute__((__format__(__printf__, 1, 2)));
+		__printflike(1, 2);
 int	 putc(int, FILE *);
 int	 putchar(int);
 int	 puts(const char *);
 int	 remove(const char *);
 void	 rewind(FILE *);
 int	 scanf(const char * __restrict, ...)
-__attribute__((__format__(__scanf__, 1, 2)));
+		__scanflike(1, 2);
 void	 setbuf(FILE * __restrict, char * __restrict);
 int	 setvbuf(FILE * __restrict, char * __restrict, int, size_t);
 int	 sscanf(const char * __restrict, const char * __restrict, ...)
-__attribute__((__format__(__scanf__, 2, 3)));
+		__scanflike(2, 3);
 FILE	*tmpfile(void);
 int	 ungetc(int, FILE *);
 int	 vfprintf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_)
-__attribute__((__format__(__printf__, 2, 0)));
+		__printflike(2, 0);
 int	 vprintf(const char * __restrict, _BSD_VA_LIST_)
-__attribute__((__format__(__printf__, 1, 0)));
+		__printflike(1, 0);
 
 #ifndef __AUDIT__
 char	*gets(char *);
 int	 sprintf(char * __restrict, const char * __restrict, ...)
-__attribute__((__format__(__printf__, 2, 3)));
+		__printflike(2, 3);
 char	*tmpnam(char *);
 int	 vsprintf(char * __restrict, const char * __restrict,
 _BSD_VA_LIST_)
-__attribute__((__format__(__printf__, 2, 0)));
+		__printflike(2, 0);
 #endif
 
 #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)
@@ -338,10 +338,10 @@
 defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
 __BEGIN_DECLS
 int	 snprintf(char * __restrict, size_t, const char * __restrict, ...)
-__attribute__((__format__(__printf__, 3, 4)));
+		__printflike(3, 4);

CVS commit: src/include

2010-02-25 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Thu Feb 25 18:37:13 UTC 2010

Modified Files:
src/include: err.h stdio.h stdlib.h util.h
src/include/ssp: stdio.h

Log Message:
Consistently use __printflike and __scanflike.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/include/err.h
cvs rdiff -u -r1.75 -r1.76 src/include/stdio.h
cvs rdiff -u -r1.90 -r1.91 src/include/stdlib.h
cvs rdiff -u -r1.54 -r1.55 src/include/util.h
cvs rdiff -u -r1.3 -r1.4 src/include/ssp/stdio.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 20:36:31 UTC 2010

Modified Files:
src/sys/dev/cardbus: com_cardbus.c if_fxp_cardbus.c rbus_ppb.c
siisata_cardbus.c

Log Message:
Don't create the device's PCI tag with Cardbus_make_tag(9), but save and
use the tag found in the cardbus_attach_args.  Compile-tested, only.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/cardbus/siisata_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/cardbus/com_cardbus.c
diff -u src/sys/dev/cardbus/com_cardbus.c:1.24 src/sys/dev/cardbus/com_cardbus.c:1.25
--- src/sys/dev/cardbus/com_cardbus.c:1.24	Wed Feb 24 19:52:51 2010
+++ src/sys/dev/cardbus/com_cardbus.c	Thu Feb 25 20:36:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: com_cardbus.c,v 1.24 2010/02/24 19:52:51 dyoung Exp $ */
+/* $NetBSD: com_cardbus.c,v 1.25 2010/02/25 20:36:31 dyoung Exp $ */
 
 /*
  * Copyright (c) 2000 Johan Danielsson
@@ -40,7 +40,7 @@
updated below.  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: com_cardbus.c,v 1.24 2010/02/24 19:52:51 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: com_cardbus.c,v 1.25 2010/02/25 20:36:31 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -212,7 +212,7 @@
 
 	sc-sc_dev = self;
 	csc-cc_ct = ca-ca_ct;
-	csc-cc_tag = Cardbus_make_tag(csc-cc_ct);
+	csc-cc_tag = ca-ca_tag;
 
 	if(gofigure(ca, csc) != 0)
 		return;

Index: src/sys/dev/cardbus/if_fxp_cardbus.c
diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.42 src/sys/dev/cardbus/if_fxp_cardbus.c:1.43
--- src/sys/dev/cardbus/if_fxp_cardbus.c:1.42	Wed Feb 24 23:38:40 2010
+++ src/sys/dev/cardbus/if_fxp_cardbus.c	Thu Feb 25 20:36:31 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fxp_cardbus.c,v 1.42 2010/02/24 23:38:40 dyoung Exp $	*/
+/*	$NetBSD: if_fxp_cardbus.c,v 1.43 2010/02/25 20:36:31 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_fxp_cardbus.c,v 1.42 2010/02/24 23:38:40 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_fxp_cardbus.c,v 1.43 2010/02/25 20:36:31 dyoung Exp $);
 
 #include opt_inet.h
 #include rnd.h
@@ -91,6 +91,7 @@
 struct fxp_cardbus_softc {
 	struct fxp_softc sc;
 	cardbus_devfunc_t ct;
+	pcitag_t tag;
 	pcireg_t base0_reg;
 	pcireg_t base1_reg;
 	bus_size_t size;
@@ -133,6 +134,7 @@
 
 	sc-sc_dev = self;
 	csc-ct = ca-ca_ct;
+	csc-tag = ca-ca_tag;
 
 	/*
  * Map control/status registers.
@@ -193,8 +195,7 @@
 	cardbus_function_tag_t cf = psc-sc_cf;
 	pcireg_t command;
 
-	pcitag_t tag = cardbus_make_tag(cc, cf, csc-ct-ct_bus,
-	csc-ct-ct_func);
+	pcitag_t tag = csc-tag;
 
 	command = Cardbus_conf_read(csc-ct, tag, CARDBUS_COMMAND_STATUS_REG);
 	if (csc-base0_reg) {

Index: src/sys/dev/cardbus/rbus_ppb.c
diff -u src/sys/dev/cardbus/rbus_ppb.c:1.32 src/sys/dev/cardbus/rbus_ppb.c:1.33
--- src/sys/dev/cardbus/rbus_ppb.c:1.32	Wed Feb 24 19:52:52 2010
+++ src/sys/dev/cardbus/rbus_ppb.c	Thu Feb 25 20:36:31 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbus_ppb.c,v 1.32 2010/02/24 19:52:52 dyoung Exp $	*/
+/*	$NetBSD: rbus_ppb.c,v 1.33 2010/02/25 20:36:31 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rbus_ppb.c,v 1.32 2010/02/24 19:52:52 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: rbus_ppb.c,v 1.33 2010/02/25 20:36:31 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -744,8 +744,7 @@
 	printf(ppb_cardbus_setup called\n);
 #if 0
 	/* not sure what to do here */
-	pcitag_t tag = cardbus_make_tag(cc, cf, csc-ct-ct_bus,
-	csc-ct-ct_dev, csc-ct-ct_func);
+	pcitag_t tag = csc-sc_tag;
 
 	command = Cardbus_conf_read(csc-ct, tag, CARDBUS_COMMAND_STATUS_REG);
 	if (csc-base0_reg) {

Index: src/sys/dev/cardbus/siisata_cardbus.c
diff -u src/sys/dev/cardbus/siisata_cardbus.c:1.6 src/sys/dev/cardbus/siisata_cardbus.c:1.7
--- src/sys/dev/cardbus/siisata_cardbus.c:1.6	Thu Feb 25 00:47:39 2010
+++ src/sys/dev/cardbus/siisata_cardbus.c	Thu Feb 25 20:36:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata_cardbus.c,v 1.6 2010/02/25 00:47:39 dyoung Exp $ */
+/* $NetBSD: siisata_cardbus.c,v 1.7 2010/02/25 20:36:31 dyoung Exp $ */
 /* Id: siisata_pci.c,v 1.11 2008/05/21 16:20:11 jakllsch Exp  */
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: siisata_cardbus.c,v 1.6 2010/02/25 00:47:39 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: siisata_cardbus.c,v 1.7 2010/02/25 20:36:31 dyoung Exp $);
 
 #include sys/types.h
 #include sys/malloc.h
@@ -73,6 +73,7 @@
 	cardbus_chipset_tag_t sc_cc;
 	cardbus_function_tag_t sc_cf;
 	cardbus_devfunc_t sc_ct;
+	pcitag_t sc_tag;
 
 	bus_size_t sc_grsize;

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 20:36:31 UTC 2010

Modified Files:
src/sys/dev/cardbus: com_cardbus.c if_fxp_cardbus.c rbus_ppb.c
siisata_cardbus.c

Log Message:
Don't create the device's PCI tag with Cardbus_make_tag(9), but save and
use the tag found in the cardbus_attach_args.  Compile-tested, only.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/cardbus/siisata_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/include

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 20:48:35 UTC 2010

Modified Files:
src/sys/arch/x86/include: pci_machdep.h

Log Message:
Change the pci_attach_args definition to allow machine-dependent
code to override the default pci(9) behavior by creating a non-NULL
pci_attach_args_t (on x86, pci_attach_args_t is always NULL) containing
one or more non-NULL function pointers.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/include/pci_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/x86/include/pci_machdep.h
diff -u src/sys/arch/x86/include/pci_machdep.h:1.12 src/sys/arch/x86/include/pci_machdep.h:1.13
--- src/sys/arch/x86/include/pci_machdep.h:1.12	Wed Feb 24 21:34:23 2010
+++ src/sys/arch/x86/include/pci_machdep.h	Thu Feb 25 20:48:34 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.h,v 1.12 2010/02/24 21:34:23 dyoung Exp $	*/
+/*	$NetBSD: pci_machdep.h,v 1.13 2010/02/25 20:48:34 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -63,9 +63,8 @@
 extern struct x86_bus_dma_tag pci_bus_dma64_tag;
 #endif
 
-struct {
-	int dummy;
-} pci_chipset_tag;
+struct pci_chipset_tag;
+struct pci_attach_args;
 
 /*
  * Types provided to machine-independent PCI code
@@ -74,6 +73,34 @@
 typedef union x86_pci_tag_u pcitag_t;
 typedef int pci_intr_handle_t;
 
+struct pci_chipset_tag {
+	pcireg_t (*pc_conf_read)(pci_chipset_tag_t, pcitag_t, int);
+
+	void (*pc_conf_write)(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
+
+#if 0
+	int (*pc_find_rom)(struct pci_attach_args *, bus_space_tag_t,
+	bus_space_handle_t, int, bus_space_handle_t *, bus_space_size_t *);
+#endif
+
+	int (*pc_intr_map)(struct pci_attach_args *, pci_intr_handle_t *);
+
+	const char *(*pc_intr_string)(pci_chipset_tag_t, pci_intr_handle_t);
+
+	const struct evcnt *(*pc_intr_evcnt)(pci_chipset_tag_t,
+	pci_intr_handle_t);
+
+	void *(*pc_intr_establish)(pci_chipset_tag_t, pci_intr_handle_t, int,
+	int (*)(void *), void *);
+
+	void (*pc_intr_disestablish)(pci_chipset_tag_t, void *);
+
+	pcitag_t (*pc_make_tag)(pci_chipset_tag_t, int, int, int);
+
+	void (*pc_decompose_tag)(pci_chipset_tag_t, pcitag_t,
+	int *, int *, int *);
+};
+
 /*
  * i386-specific PCI variables and functions.
  * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
@@ -81,7 +108,6 @@
 void		pci_mode_set(int);
 int		pci_mode_detect(void);
 int		pci_bus_flags(void);
-struct		pci_attach_args;
 
 /*
  * Functions provided to machine-independent PCI code.

CVS commit: src/sys/arch/x86/include

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 20:48:35 UTC 2010

Modified Files:
src/sys/arch/x86/include: pci_machdep.h

Log Message:
Change the pci_attach_args definition to allow machine-dependent
code to override the default pci(9) behavior by creating a non-NULL
pci_attach_args_t (on x86, pci_attach_args_t is always NULL) containing
one or more non-NULL function pointers.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/include/pci_machdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/dm

2010-02-25 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Thu Feb 25 20:48:59 UTC 2010

Modified Files:
src/sys/dev/dm: device-mapper.c dm_ioctl.c

Log Message:
Be sure to config_cfattach_attach() in dmattach().
Loosely based on patch from Brian Brombacher,
with other inspriation from vnd(4).

This should fix PR kern/42799.

While here, a few prototype, style and namespace pollution-related changes.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dm/dm_ioctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/dm

2010-02-25 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Thu Feb 25 20:48:59 UTC 2010

Modified Files:
src/sys/dev/dm: device-mapper.c dm_ioctl.c

Log Message:
Be sure to config_cfattach_attach() in dmattach().
Loosely based on patch from Brian Brombacher,
with other inspriation from vnd(4).

This should fix PR kern/42799.

While here, a few prototype, style and namespace pollution-related changes.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dm/dm_ioctl.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/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.15 src/sys/dev/dm/device-mapper.c:1.16
--- src/sys/dev/dm/device-mapper.c:1.15	Fri Jan  8 00:27:48 2010
+++ src/sys/dev/dm/device-mapper.c	Thu Feb 25 20:48:58 2010
@@ -1,4 +1,4 @@
-/*$NetBSD: device-mapper.c,v 1.15 2010/01/08 00:27:48 pooka Exp $ */
+/*$NetBSD: device-mapper.c,v 1.16 2010/02/25 20:48:58 jakllsch Exp $ */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,9 +59,10 @@
 static dev_type_size(dmsize);
 
 /* attach and detach routines */
-int dmattach(void);
-int dmdestroy(void);
+void dmattach(int);
+void dmdestroy(void);
 
+static void dm_init(void);
 static int dm_cmd_to_fun(prop_dictionary_t);
 static int disk_ioctl_switch(dev_t, u_long, void *);
 static int dm_ioctl_switch(u_long);
@@ -112,7 +113,7 @@
 
 extern struct cfdriver dm_cd;
 
-extern uint64_t dev_counter;
+extern uint64_t dm_dev_counter;
 
 /*
  * This array is used to translate cmd to function pointer.
@@ -149,15 +150,15 @@
 dm_modcmd(modcmd_t cmd, void *arg)
 {
 #ifdef _MODULE
-	int bmajor = -1, cmajor = -1;
 	int error;
+	int bmajor, cmajor;
 
 	error = 0;
+	bmajor = -1;
+	cmajor = -1;
 
 	switch (cmd) {
 	case MODULE_CMD_INIT:
-		dmattach();
-
 		error = config_cfdriver_attach(dm_cd);
 		if (error)
 			break;
@@ -165,13 +166,21 @@
 		error = config_cfattach_attach(dm_cd.cd_name, dm_ca);
 		if (error) {
 			config_cfdriver_detach(dm_cd);
-			aprint_error(Unable to register cfattach for dm driver\n);
-
+			aprint_error(%s: unable to register cfattach\n,
+			dm_cd.cd_name);
 			break;
 		}
 
-		error =  devsw_attach(dm, dm_bdevsw, bmajor,
+		error = devsw_attach(dm_cd.cd_name, dm_bdevsw, bmajor,
 		dm_cdevsw, cmajor);
+		if (error) {
+			config_cfattach_detach(dm_cd.cd_name, dm_ca);
+			config_cfdriver_detach(dm_cd);
+			break;
+		}
+
+		dm_init();
+
 		break;
 
 	case MODULE_CMD_FINI:
@@ -181,7 +190,7 @@
 		 * to disable auto-unload only if there is mounted dm device
 		 * present.
 		 */ 
-		if (dev_counter  0)
+		if (dm_dev_counter  0)
 			return EBUSY;
 		dmdestroy();
 
@@ -270,25 +279,29 @@
 	(void)dm_dev_free(dmv);
 
 	/* Decrement device counter After removing device */
-	atomic_dec_64(dev_counter);
+	atomic_dec_64(dm_dev_counter);
 
 	return 0;
 }
 
 /* attach routine */
-int
-dmattach(void)
+void
+dmattach(int num)
 {
+	int error;
 
-	dm_target_init();
-	dm_dev_init();
-	dm_pdev_init();
+	error = config_cfattach_attach(dm_cd.cd_name, dm_ca);
+	if (error) {
+		aprint_error(%s: unable to register cfattach\n,
+		dm_cd.cd_name);
+		return;
+	}
 
-	return 0;
+	dm_init();
 }
 
 /* Destroy routine */
-int
+void
 dmdestroy(void)
 {
 
@@ -296,7 +309,6 @@
 	dm_pdev_destroy();
 	dm_target_destroy();
 
-	return 0;
 }
 
 static int
@@ -354,6 +366,14 @@
 	return r;
 }
 
+static void
+dm_init(void)
+{
+	dm_target_init();
+	dm_dev_init();
+	dm_pdev_init();
+}
+
 /*
  * Translate command sent from libdevmapper to func.
  */

Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.20 src/sys/dev/dm/dm_ioctl.c:1.21
--- src/sys/dev/dm/dm_ioctl.c:1.20	Mon Jan  4 00:19:08 2010
+++ src/sys/dev/dm/dm_ioctl.c	Thu Feb 25 20:48:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.20 2010/01/04 00:19:08 haad Exp $  */
+/* $NetBSD: dm_ioctl.c,v 1.21 2010/02/25 20:48:58 jakllsch Exp $  */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
 
 static uint64_t sc_minor_num;
 extern const struct dkdriver dmdkdriver;
-uint64_t dev_counter;
+uint64_t dm_dev_counter;
 
 /* Generic cf_data for device-mapper driver */
 static struct cfdata dm_cfdata = {
@@ -266,7 +266,7 @@
 	DM_REMOVE_FLAG(flags, DM_INACTIVE_PRESENT_FLAG);
 
 	/* Increment device counter After creating device */
-	atomic_inc_64(dev_counter);
+	atomic_inc_64(dm_dev_counter);
 
 	return r;
 }

CVS commit: src/sys/arch/x86/pci

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 20:51:10 UTC 2010

Modified Files:
src/sys/arch/x86/pci: pci_intr_machdep.c pci_machdep.c

Log Message:
In the x86 pci(9) implementation, test for and call a
pci_chipset_tag_t's override functions.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/pci/pci_intr_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/pci/pci_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/pci

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 20:51:10 UTC 2010

Modified Files:
src/sys/arch/x86/pci: pci_intr_machdep.c pci_machdep.c

Log Message:
In the x86 pci(9) implementation, test for and call a
pci_chipset_tag_t's override functions.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/pci/pci_intr_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/pci/pci_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/pci/pci_intr_machdep.c
diff -u src/sys/arch/x86/pci/pci_intr_machdep.c:1.14 src/sys/arch/x86/pci/pci_intr_machdep.c:1.15
--- src/sys/arch/x86/pci/pci_intr_machdep.c:1.14	Tue Aug 18 16:41:03 2009
+++ src/sys/arch/x86/pci/pci_intr_machdep.c	Thu Feb 25 20:51:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_intr_machdep.c,v 1.14 2009/08/18 16:41:03 jmcneill Exp $	*/
+/*	$NetBSD: pci_intr_machdep.c,v 1.15 2010/02/25 20:51:10 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_intr_machdep.c,v 1.14 2009/08/18 16:41:03 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_intr_machdep.c,v 1.15 2010/02/25 20:51:10 dyoung Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -115,12 +115,15 @@
 {
 	int pin = pa-pa_intrpin;
 	int line = pa-pa_intrline;
+	pci_chipset_tag_t pc;
 #if NIOAPIC  0 || NACPICA  0
 	int rawpin = pa-pa_rawintrpin;
-	pci_chipset_tag_t pc = pa-pa_pc;
 	int bus, dev, func;
 #endif
 
+	if ((pc = pa-pa_pc) != NULL  pc-pc_intr_map != NULL)
+		return (*pc-pc_intr_map)(pa, ihp);
+
 	if (pin == 0) {
 		/* No IRQ used. */
 		goto bad;
@@ -207,6 +210,9 @@
 const char *
 pci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih)
 {
+	if (pc != NULL  pc-pc_intr_string != NULL)
+		return (*pc-pc_intr_string)(pc, ih);
+
 	return intr_string(ih  ~MPSAFE_MASK);
 }
 
@@ -215,6 +221,9 @@
 pci_intr_evcnt(pci_chipset_tag_t pc, pci_intr_handle_t ih)
 {
 
+	if (pc != NULL  pc-pc_intr_evcnt != NULL)
+		return (*pc-pc_intr_evcnt)(pc, ih);
+
 	/* XXX for now, no evcnt parent reported */
 	return NULL;
 }
@@ -249,6 +258,9 @@
 #endif
 	bool mpsafe;
 
+	if (pc != NULL  pc-pc_intr_establish != NULL)
+		return (*pc-pc_intr_establish)(pc, ih, level, func, arg);
+
 	pic = i8259_pic;
 	pin = irq = (ih  ~MPSAFE_MASK);
 	mpsafe = ((ih  MPSAFE_MASK) != 0);
@@ -277,5 +289,10 @@
 pci_intr_disestablish(pci_chipset_tag_t pc, void *cookie)
 {
 
+	if (pc != NULL  pc-pc_intr_disestablish != NULL) {
+		(*pc-pc_intr_disestablish)(pc, cookie);
+		return;
+	}
+
 	intr_disestablish(cookie);
 }

Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.39 src/sys/arch/x86/pci/pci_machdep.c:1.40
--- src/sys/arch/x86/pci/pci_machdep.c:1.39	Tue Feb 16 19:29:40 2010
+++ src/sys/arch/x86/pci/pci_machdep.c	Thu Feb 25 20:51:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.39 2010/02/16 19:29:40 dyoung Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.40 2010/02/25 20:51:10 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.39 2010/02/16 19:29:40 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.40 2010/02/25 20:51:10 dyoung Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -344,6 +344,9 @@
 {
 	pcitag_t tag;
 
+	if (pc != NULL  pc-pc_make_tag != NULL)
+		return (*pc-pc_make_tag)(pc, bus, device, function);
+
 	switch (pci_mode) {
 	case 1:
 		if (bus = 256 || device = 32 || function = 8)
@@ -370,6 +373,11 @@
 int *bp, int *dp, int *fp)
 {
 
+	if (pc != NULL  pc-pc_decompose_tag != NULL) {
+		(*pc-pc_decompose_tag)(pc, tag, bp, dp, fp);
+		return;
+	}
+
 	switch (pci_mode) {
 	case 1:
 		if (bp != NULL)
@@ -400,6 +408,10 @@
 	int s;
 
 	KASSERT((reg  0x3) == 0);
+
+	if (pc != NULL  pc-pc_conf_read != NULL)
+		return (*pc-pc_conf_read)(pc, tag, reg);
+
 #if defined(__i386__)  defined(XBOX)
 	if (arch_i386_is_xbox) {
 		int bus, dev, fn;
@@ -424,6 +436,12 @@
 	int s;
 
 	KASSERT((reg  0x3) == 0);
+
+	if (pc != NULL  pc-pc_conf_write != NULL) {
+		(*pc-pc_conf_write)(pc, tag, reg, data);
+		return;
+	}
+
 #if defined(__i386__)  defined(XBOX)
 	if (arch_i386_is_xbox) {
 		int bus, dev, fn;

CVS commit: src/sys/dev/pci

2010-02-25 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Feb 25 20:56:20 UTC 2010

Modified Files:
src/sys/dev/pci: wcfb.c

Log Message:
some cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/wcfb.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/wcfb.c
diff -u src/sys/dev/pci/wcfb.c:1.1 src/sys/dev/pci/wcfb.c:1.2
--- src/sys/dev/pci/wcfb.c:1.1	Thu Feb 25 03:33:09 2010
+++ src/sys/dev/pci/wcfb.c	Thu Feb 25 20:56:20 2010
@@ -1,7 +1,7 @@
-/*	$NetBSD: wcfb.c,v 1.1 2010/02/25 03:33:09 macallan Exp $ */
+/*	$NetBSD: wcfb.c,v 1.2 2010/02/25 20:56:20 macallan Exp $ */
 
 /*-
- * Copyright (c) 2007 Michael Lorenz
+ * Copyright (c) 2010 Michael Lorenz
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wcfb.c,v 1.1 2010/02/25 03:33:09 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: wcfb.c,v 1.2 2010/02/25 20:56:20 macallan Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -154,7 +154,6 @@
 	bool			is_console;
 	char 			devinfo[256];
 	void *wtf;
-	uint32_t *tcfb;
 
 	sc-sc_dev = self;
 	sc-putchar = NULL;
@@ -164,7 +163,7 @@
 
 	dict = device_properties(self);
 	prop_dictionary_get_bool(dict, is_console, is_console);
-if(!is_console) return;
+	if(!is_console) return;
 
 	sc-sc_memt = pa-pa_memt;
 	sc-sc_iot = pa-pa_iot;	
@@ -347,6 +346,11 @@
 	 * somewhere in a MD header and compile this code only if all are
 	 * present
 	 */
+	/*
+	 * PCI_IOAREA_PADDR is useless, that's what the IO tag is for
+	 * the address isn't guaranteed to be the same on each host bridge
+	 * either, never mind the fact that it would be a bus address
+	 */
 #ifdef PCI_MAGIC_IO_RANGE
 	/* allow to map our IO space */
 	if ((offset = PCI_MAGIC_IO_RANGE)

CVS commit: src/sys/dev/pci

2010-02-25 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Feb 25 20:56:20 UTC 2010

Modified Files:
src/sys/dev/pci: wcfb.c

Log Message:
some cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/wcfb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/pci

2010-02-25 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Feb 25 21:09:00 UTC 2010

Modified Files:
src/sys/dev/pci: genfb_pci.c

Log Message:
add a comment on PCI_MAGIC_IO_RANGE


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/genfb_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/genfb_pci.c
diff -u src/sys/dev/pci/genfb_pci.c:1.23 src/sys/dev/pci/genfb_pci.c:1.24
--- src/sys/dev/pci/genfb_pci.c:1.23	Mon Aug 24 11:32:49 2009
+++ src/sys/dev/pci/genfb_pci.c	Thu Feb 25 21:09:00 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfb_pci.c,v 1.23 2009/08/24 11:32:49 jmcneill Exp $ */
+/*	$NetBSD: genfb_pci.c,v 1.24 2010/02/25 21:09:00 macallan Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb_pci.c,v 1.23 2009/08/24 11:32:49 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb_pci.c,v 1.24 2010/02/25 21:09:00 macallan Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -97,6 +97,7 @@
 	struct pci_genfb_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct genfb_ops ops;
+	pcireg_t rom;
 	int idx, bar, type;
 	char devinfo[256];
 
@@ -136,7 +137,7 @@
 	/* mmap()able bus ranges */
 	idx = 0;
 	bar = 0x10;
-	while (bar  0x30) {
+	while (bar  0x34) {
 
 		type = pci_mapreg_type(sc-sc_pc, sc-sc_pcitag, bar);
 		if ((type == PCI_MAPREG_TYPE_MEM) || 
@@ -148,10 +149,15 @@
 			sc-sc_ranges[idx].flags);
 			idx++;
 		}
-		sc-sc_bars[(bar - 0x10)  2] =
+		sc-sc_bars[(bar - 0x10)  2] = rom =
 		pci_conf_read(sc-sc_pc, sc-sc_pcitag, bar);
+		if ((bar == PCI_MAPREG_ROM)  (rom != 0)) {
+			pci_conf_write(sc-sc_pc, sc-sc_pcitag, bar, rom |
+			PCI_MAPREG_ROM_ENABLE);
+		}
 		bar += 4;
 	}
+
 	sc-sc_ranges_used = idx;			
 
 	ops.genfb_ioctl = pci_genfb_ioctl;
@@ -258,6 +264,25 @@
 	 * somewhere in a MD header and compile this code only if all are
 	 * present
 	 */
+	/*
+	 * no.
+	 * PCI_IOAREA_PADDR would be completely, utterly wrong and completely
+	 * useless for the following reasons:
+	 * - it's a bus address, not a physical address
+	 * - there's no guarantee it's the same for each host bridge
+	 * - it's already taken care of by the IO tag
+	 * PCI_IOAREA_OFFSET is the same as PCI_MAGIC_IO_RANGE
+	 * PCI_IOAREA_SIZE is also useless:
+	 * - many cards don't decode more than 16 bit IO anyway
+	 * - even machines with more than 64kB IO space try to keep everything
+	 *   within 64kB for the reason above
+	 * - IO ranges tend to be small so in most cases you can't cram enough
+	 *   cards into a single machine to exhaust 64kB IO space
+	 * - machines which need this tend to prefer memory space anyway
+	 * - the only use for this right now is to allow the Xserver to map
+	 *   VGA registers on macppc and a few other powerpc ports, shark uses
+	 *   a similar mechanism, and what they need is always within 64kB
+	 */
 #ifdef PCI_MAGIC_IO_RANGE
 	/* allow to map our IO space */
 	if ((offset = PCI_MAGIC_IO_RANGE)

CVS commit: src/sys/dev/pci

2010-02-25 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Feb 25 21:09:00 UTC 2010

Modified Files:
src/sys/dev/pci: genfb_pci.c

Log Message:
add a comment on PCI_MAGIC_IO_RANGE


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/genfb_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/doc

2010-02-25 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Feb 25 21:13:07 UTC 2010

Modified Files:
src/doc: CHANGES

Log Message:
mention wcfb


To generate a diff of this commit:
cvs rdiff -u -r1.1361 -r1.1362 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/doc

2010-02-25 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Feb 25 21:13:07 UTC 2010

Modified Files:
src/doc: CHANGES

Log Message:
mention wcfb


To generate a diff of this commit:
cvs rdiff -u -r1.1361 -r1.1362 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1361 src/doc/CHANGES:1.1362
--- src/doc/CHANGES:1.1361	Sun Feb 21 05:21:25 2010
+++ src/doc/CHANGES	Thu Feb 25 21:13:07 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1361 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1362 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -554,3 +554,4 @@
 		hardware monitor with limit support.	[cnst 20100209]
 	wbsio(4): New driver for Winbond Super I/O attachment of
 		lm(4) on any port.	[cnst 20100221]
+	wcfb: A driver for 3Dlabs Wildcat graphics cards [macallan 20100224]

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 21:18:35 UTC 2010

Modified Files:
src/sys/dev/cardbus: cardbus.c cardbusreg.h njata_cardbus.c
njs_cardbus.c siisata_cardbus.c

Log Message:
Phase out some CardBus constants and types.  Use the equivalent PCI
constants and types, instead:

CARDBUS_CLASS_REG - PCI_CLASS_REG
CARDBUS_ID_REG - PCI_ID_REG
cardbus_product_id_t - pci_product_id_t
cardbus_vendor_id_t - pci_vendor_id_t


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/cardbus/cardbusreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/cardbus/njata_cardbus.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/cardbus/njs_cardbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/cardbus/siisata_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 21:18:35 UTC 2010

Modified Files:
src/sys/dev/cardbus: cardbus.c cardbusreg.h njata_cardbus.c
njs_cardbus.c siisata_cardbus.c

Log Message:
Phase out some CardBus constants and types.  Use the equivalent PCI
constants and types, instead:

CARDBUS_CLASS_REG - PCI_CLASS_REG
CARDBUS_ID_REG - PCI_ID_REG
cardbus_product_id_t - pci_product_id_t
cardbus_vendor_id_t - pci_vendor_id_t


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/cardbus/cardbusreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/cardbus/njata_cardbus.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/cardbus/njs_cardbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/cardbus/siisata_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/cardbus/cardbus.c
diff -u src/sys/dev/cardbus/cardbus.c:1.103 src/sys/dev/cardbus/cardbus.c:1.104
--- src/sys/dev/cardbus/cardbus.c:1.103	Thu Feb 25 00:47:39 2010
+++ src/sys/dev/cardbus/cardbus.c	Thu Feb 25 21:18:35 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cardbus.c,v 1.103 2010/02/25 00:47:39 dyoung Exp $	*/
+/*	$NetBSD: cardbus.c,v 1.104 2010/02/25 21:18:35 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999 and 2000
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cardbus.c,v 1.103 2010/02/25 00:47:39 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: cardbus.c,v 1.104 2010/02/25 21:18:35 dyoung Exp $);
 
 #include opt_cardbus.h
 
@@ -460,7 +460,7 @@
 		int i;
 
 		for (i = 0; i  5; ++i) {
-			id = cardbus_conf_read(cc, cf, tag, CARDBUS_ID_REG);
+			id = cardbus_conf_read(cc, cf, tag, PCI_ID_REG);
 			if (id != 0x  id != 0) {
 break;
 			}
@@ -497,8 +497,8 @@
 
 		tag = cardbus_make_tag(cc, cf, sc-sc_bus, function);
 
-		id = cardbus_conf_read(cc, cf, tag, CARDBUS_ID_REG);
-		class = cardbus_conf_read(cc, cf, tag, CARDBUS_CLASS_REG);
+		id = cardbus_conf_read(cc, cf, tag, PCI_ID_REG);
+		class = cardbus_conf_read(cc, cf, tag, PCI_CLASS_REG);
 		cis_ptr = cardbus_conf_read(cc, cf, tag, CARDBUS_CIS_REG);
 
 		/* Invalid vendor ID value? */

Index: src/sys/dev/cardbus/cardbusreg.h
diff -u src/sys/dev/cardbus/cardbusreg.h:1.4 src/sys/dev/cardbus/cardbusreg.h:1.5
--- src/sys/dev/cardbus/cardbusreg.h:1.4	Wed Feb 24 23:38:40 2010
+++ src/sys/dev/cardbus/cardbusreg.h	Thu Feb 25 21:18:35 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cardbusreg.h,v 1.4 2010/02/24 23:38:40 dyoung Exp $ */
+/*	$NetBSD: cardbusreg.h,v 1.5 2010/02/25 21:18:35 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -33,11 +33,6 @@
 
 typedef int cardbus_intr_line_t;
 
-#define CARDBUS_ID_REG  0x00
-
-typedef u_int16_t cardbus_vendor_id_t;
-typedef u_int16_t cardbus_product_id_t;
-
 #  define CARDBUS_VENDOR_SHIFT  0
 #  define CARDBUS_VENDOR_MASK   0x
 #  define CARDBUS_VENDOR(id) \
@@ -63,8 +58,6 @@
 #  define CARDBUS_COMMAND_BACKTOBACK_ENABLE  0x0200
 
 
-#define CARDBUS_CLASS_REG   0x08
-
 #define	CARDBUS_CLASS_SHIFT24
 #define	CARDBUS_CLASS_MASK0xff
 #define	CARDBUS_CLASS(cr) \

Index: src/sys/dev/cardbus/njata_cardbus.c
diff -u src/sys/dev/cardbus/njata_cardbus.c:1.9 src/sys/dev/cardbus/njata_cardbus.c:1.10
--- src/sys/dev/cardbus/njata_cardbus.c:1.9	Wed Feb 24 19:52:52 2010
+++ src/sys/dev/cardbus/njata_cardbus.c	Thu Feb 25 21:18:35 2010
@@ -1,4 +1,4 @@
-/*	$Id: njata_cardbus.c,v 1.9 2010/02/24 19:52:52 dyoung Exp $	*/
+/*	$Id: njata_cardbus.c,v 1.10 2010/02/25 21:18:35 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2006 ITOH Yasufumi it...@netbsd.org.
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: njata_cardbus.c,v 1.9 2010/02/24 19:52:52 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: njata_cardbus.c,v 1.10 2010/02/25 21:18:35 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -71,8 +71,8 @@
 njata_cardbus_match, njata_cardbus_attach, njata_cardbus_detach, NULL);
 
 static const struct njata32_cardbus_product {
-	cardbus_vendor_id_t	p_vendor;
-	cardbus_product_id_t	p_product;
+	pci_vendor_id_t		p_vendor;
+	pci_product_id_t	p_product;
 	uint8_t			p_flags;
 #define NJATA32_FL_IOMAP_ONLY	1	/* registers are only in the I/O map */
 } njata32_cardbus_products[] = {

Index: src/sys/dev/cardbus/njs_cardbus.c
diff -u src/sys/dev/cardbus/njs_cardbus.c:1.12 src/sys/dev/cardbus/njs_cardbus.c:1.13
--- src/sys/dev/cardbus/njs_cardbus.c:1.12	Wed Feb 24 19:52:52 2010
+++ src/sys/dev/cardbus/njs_cardbus.c	Thu Feb 25 21:18:35 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: njs_cardbus.c,v 1.12 2010/02/24 19:52:52 dyoung Exp $	*/
+/*	$NetBSD: njs_cardbus.c,v 1.13 2010/02/25 21:18:35 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: njs_cardbus.c,v 1.12 2010/02/24 19:52:52 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD:

CVS commit: src/sys/arch/xen/include

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 22:20:03 UTC 2010

Modified Files:
src/sys/arch/xen/include: pci_machdep.h

Log Message:
Fix Xen.

XXX Almost everything in this header file, x86, amd64, and i386 should
XXX share.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/xen/include/pci_machdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/xen/include

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 22:20:03 UTC 2010

Modified Files:
src/sys/arch/xen/include: pci_machdep.h

Log Message:
Fix Xen.

XXX Almost everything in this header file, x86, amd64, and i386 should
XXX share.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/xen/include/pci_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/xen/include/pci_machdep.h
diff -u src/sys/arch/xen/include/pci_machdep.h:1.15 src/sys/arch/xen/include/pci_machdep.h:1.16
--- src/sys/arch/xen/include/pci_machdep.h:1.15	Tue Feb 16 00:47:46 2010
+++ src/sys/arch/xen/include/pci_machdep.h	Thu Feb 25 22:20:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.15 2010/02/16 00:47:46 dyoung Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.16 2010/02/25 22:20:03 dyoung Exp $ */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -79,19 +79,50 @@
 	} mode2;
 };
 
-typedef union x86_pci_tag_u pcitag_t;
-
 #ifndef DOM0OPS
 int		xpci_enumerate_bus(struct pci_softc *, const int *,
 		   int (*)(struct pci_attach_args *), struct pci_attach_args *);
 #define PCI_MACHDEP_ENUMERATE_BUS xpci_enumerate_bus
 #endif
-typedef void *pci_chipset_tag_t;
+struct pci_chipset_tag;
+struct pci_attach_args;
 
+/*
+ * Types provided to machine-independent PCI code
+ */
+typedef struct pci_chipset_tag *pci_chipset_tag_t;
+typedef union x86_pci_tag_u pcitag_t;
 typedef struct xen_intr_handle pci_intr_handle_t;
 
+struct pci_chipset_tag {
+	pcireg_t (*pc_conf_read)(pci_chipset_tag_t, pcitag_t, int);
+
+	void (*pc_conf_write)(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
+
+#if 0
+	int (*pc_find_rom)(struct pci_attach_args *, bus_space_tag_t,
+	bus_space_handle_t, int, bus_space_handle_t *, bus_space_size_t *);
+#endif
+
+	int (*pc_intr_map)(struct pci_attach_args *, pci_intr_handle_t *);
+
+	const char *(*pc_intr_string)(pci_chipset_tag_t, pci_intr_handle_t);
+
+	const struct evcnt *(*pc_intr_evcnt)(pci_chipset_tag_t,
+	pci_intr_handle_t);
+
+	void *(*pc_intr_establish)(pci_chipset_tag_t, pci_intr_handle_t, int,
+	int (*)(void *), void *);
+
+	void (*pc_intr_disestablish)(pci_chipset_tag_t, void *);
+
+	pcitag_t (*pc_make_tag)(pci_chipset_tag_t, int, int, int);
+
+	void (*pc_decompose_tag)(pci_chipset_tag_t, pcitag_t,
+	int *, int *, int *);
+};
+
 /* functions provided to MI PCI */
-struct pci_attach_args;
 
 void		pci_attach_hook(device_t, device_t,
 		struct pcibus_attach_args *);

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 22:31:51 UTC 2010

Modified Files:
src/sys/dev/cardbus: com_cardbus.c if_fxp_cardbus.c

Log Message:
Don't use the cardbus_softc.  Compile-tested, only.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cardbus/if_fxp_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/cardbus/com_cardbus.c
diff -u src/sys/dev/cardbus/com_cardbus.c:1.25 src/sys/dev/cardbus/com_cardbus.c:1.26
--- src/sys/dev/cardbus/com_cardbus.c:1.25	Thu Feb 25 20:36:31 2010
+++ src/sys/dev/cardbus/com_cardbus.c	Thu Feb 25 22:31:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: com_cardbus.c,v 1.25 2010/02/25 20:36:31 dyoung Exp $ */
+/* $NetBSD: com_cardbus.c,v 1.26 2010/02/25 22:31:51 dyoung Exp $ */
 
 /*
  * Copyright (c) 2000 Johan Danielsson
@@ -40,7 +40,7 @@
updated below.  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: com_cardbus.c,v 1.25 2010/02/25 20:36:31 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: com_cardbus.c,v 1.26 2010/02/25 22:31:51 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -57,6 +57,7 @@
 
 struct com_cardbus_softc {
 	struct com_softc	cc_com;
+	cardbus_intr_line_t	cc_intrline;
 	void			*cc_ih;
 	cardbus_devfunc_t	cc_ct;
 	bus_addr_t		cc_addr;
@@ -211,6 +212,7 @@
 	bus_space_tag_t		iot;
 
 	sc-sc_dev = self;
+	csc-cc_intrline = ca-ca_intrline;
 	csc-cc_ct = ca-ca_ct;
 	csc-cc_tag = ca-ca_tag;
 
@@ -297,17 +299,16 @@
 com_cardbus_enable(struct com_softc *sc)
 {
 	struct com_cardbus_softc *csc = (struct com_cardbus_softc*)sc;
-	struct cardbus_softc *psc =
-		device_private(device_parent(sc-sc_dev));
-	cardbus_chipset_tag_t cc = psc-sc_cc;
-	cardbus_function_tag_t cf = psc-sc_cf;
+	cardbus_devfunc_t ct = csc-cc_ct;
+	cardbus_chipset_tag_t cc = ct-ct_cc;
+	cardbus_function_tag_t cf = ct-ct_cf;
 
-	Cardbus_function_enable(csc-cc_ct);
+	Cardbus_function_enable(ct);
 
 	com_cardbus_setup(csc);
 
 	/* establish the interrupt. */
-	csc-cc_ih = cardbus_intr_establish(cc, cf, psc-sc_intrline,
+	csc-cc_ih = cardbus_intr_establish(cc, cf, csc-cc_intrline,
 	IPL_SERIAL, comintr, sc);
 	if (csc-cc_ih == NULL) {
 		aprint_error_dev(DEVICET(csc),
@@ -322,15 +323,14 @@
 com_cardbus_disable(struct com_softc *sc)
 {
 	struct com_cardbus_softc *csc = (struct com_cardbus_softc*)sc;
-	struct cardbus_softc *psc =
-		device_private(device_parent(sc-sc_dev));
-	cardbus_chipset_tag_t cc = psc-sc_cc;
-	cardbus_function_tag_t cf = psc-sc_cf;
+	cardbus_devfunc_t ct = csc-cc_ct;
+	cardbus_chipset_tag_t cc = ct-ct_cc;
+	cardbus_function_tag_t cf = ct-ct_cf;
 
 	cardbus_intr_disestablish(cc, cf, csc-cc_ih);
 	csc-cc_ih = NULL;
 
-	Cardbus_function_disable(csc-cc_ct);
+	Cardbus_function_disable(ct);
 }
 
 static int
@@ -338,14 +338,14 @@
 {
 	struct com_cardbus_softc *csc = device_private(self);
 	struct com_softc *sc = device_private(self);
-	struct cardbus_softc *psc = device_private(device_parent(self));
+	cardbus_devfunc_t ct = csc-cc_ct;
 	int error;
 
 	if ((error = com_detach(self, flags)) != 0)
 		return error;
 
 	if (csc-cc_ih != NULL)
-		cardbus_intr_disestablish(psc-sc_cc, psc-sc_cf, csc-cc_ih);
+		cardbus_intr_disestablish(ct-ct_cc, ct-ct_cf, csc-cc_ih);
 
 	Cardbus_mapreg_unmap(csc-cc_ct, csc-cc_reg, sc-sc_regs.cr_iot,
 	sc-sc_regs.cr_ioh, csc-cc_size);

Index: src/sys/dev/cardbus/if_fxp_cardbus.c
diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.43 src/sys/dev/cardbus/if_fxp_cardbus.c:1.44
--- src/sys/dev/cardbus/if_fxp_cardbus.c:1.43	Thu Feb 25 20:36:31 2010
+++ src/sys/dev/cardbus/if_fxp_cardbus.c	Thu Feb 25 22:31:51 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fxp_cardbus.c,v 1.43 2010/02/25 20:36:31 dyoung Exp $	*/
+/*	$NetBSD: if_fxp_cardbus.c,v 1.44 2010/02/25 22:31:51 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_fxp_cardbus.c,v 1.43 2010/02/25 20:36:31 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_fxp_cardbus.c,v 1.44 2010/02/25 22:31:51 dyoung Exp $);
 
 #include opt_inet.h
 #include rnd.h
@@ -91,6 +91,7 @@
 struct fxp_cardbus_softc {
 	struct fxp_softc sc;
 	cardbus_devfunc_t ct;
+	cardbus_intr_line_t intrline;
 	pcitag_t tag;
 	pcireg_t base0_reg;
 	pcireg_t base1_reg;
@@ -133,6 +134,7 @@
 	bus_size_t size;
 
 	sc-sc_dev = self;
+	csc-intrline = ca-ca_intrline;
 	csc-ct = ca-ca_ct;
 	csc-tag = ca-ca_tag;
 
@@ -190,9 +192,8 @@
 fxp_cardbus_setup(struct fxp_softc * sc)
 {
 	struct fxp_cardbus_softc *csc = (struct fxp_cardbus_softc *)sc;
-	struct cardbus_softc *psc = device_private(device_parent(sc-sc_dev));
-	cardbus_chipset_tag_t cc = psc-sc_cc;
-	cardbus_function_tag_t cf = psc-sc_cf;
+	cardbus_chipset_tag_t cc = csc-ct-ct_cc;
+	cardbus_function_tag_t cf = csc-ct-ct_cf;
 	pcireg_t command;
 
 	pcitag_t tag = csc-tag;
@@ -222,9 +223,8 @@

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 22:31:51 UTC 2010

Modified Files:
src/sys/dev/cardbus: com_cardbus.c if_fxp_cardbus.c

Log Message:
Don't use the cardbus_softc.  Compile-tested, only.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cardbus/if_fxp_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 22:40:16 UTC 2010

Modified Files:
src/sys/dev/cardbus: siisata_cardbus.c

Log Message:
Copy values from the cardbus_attach_args and use them instead of values
from the cardbus_softc.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/cardbus/siisata_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 22:40:16 UTC 2010

Modified Files:
src/sys/dev/cardbus: siisata_cardbus.c

Log Message:
Copy values from the cardbus_attach_args and use them instead of values
from the cardbus_softc.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/cardbus/siisata_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/cardbus/siisata_cardbus.c
diff -u src/sys/dev/cardbus/siisata_cardbus.c:1.8 src/sys/dev/cardbus/siisata_cardbus.c:1.9
--- src/sys/dev/cardbus/siisata_cardbus.c:1.8	Thu Feb 25 21:18:35 2010
+++ src/sys/dev/cardbus/siisata_cardbus.c	Thu Feb 25 22:40:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata_cardbus.c,v 1.8 2010/02/25 21:18:35 dyoung Exp $ */
+/* $NetBSD: siisata_cardbus.c,v 1.9 2010/02/25 22:40:16 dyoung Exp $ */
 /* Id: siisata_pci.c,v 1.11 2008/05/21 16:20:11 jakllsch Exp  */
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: siisata_cardbus.c,v 1.8 2010/02/25 21:18:35 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: siisata_cardbus.c,v 1.9 2010/02/25 22:40:16 dyoung Exp $);
 
 #include sys/types.h
 #include sys/malloc.h
@@ -74,6 +74,12 @@
 	cardbus_function_tag_t sc_cf;
 	cardbus_devfunc_t sc_ct;
 	pcitag_t sc_tag;
+	bus_space_tag_t sc_iot;		/* CardBus I/O space tag */
+	bus_space_tag_t sc_memt;	/* CardBus MEM space tag */
+#if rbus
+	rbus_tag_t sc_rbus_iot;		/* CardBus i/o rbus tag */
+	rbus_tag_t sc_rbus_memt;	/* CardBus mem rbus tag */
+#endif
 
 	bus_size_t sc_grsize;
 	bus_size_t sc_prsize;
@@ -134,7 +140,6 @@
 siisata_cardbus_attach(device_t parent, device_t self, void *aux)
 {
 	struct cardbus_attach_args *ca = aux;
-	struct cardbus_softc *cbsc = device_private(parent);
 	struct siisata_cardbus_softc *csc = device_private(self);
 	struct siisata_softc *sc = csc-si_sc;
 	cardbus_devfunc_t ct = ca-ca_ct;
@@ -156,6 +161,13 @@
 	csc-sc_ct = ct;
 	csc-sc_tag = ca-ca_tag;
 
+	csc-sc_iot = ca-ca_iot;
+	csc-sc_memt = ca-ca_memt;
+#if rbus
+	csc-sc_rbus_iot = ca-ca_rbus_iot;
+	csc-sc_rbus_memt = ca-ca_rbus_memt;
+#endif
+
 	cardbus_devinfo(ca-ca_id, ca-ca_class, 0, devinfo, sizeof(devinfo));
 	aprint_naive(: SATA-II HBA\n);
 	aprint_normal(: %s\n, devinfo);
@@ -172,8 +184,8 @@
 		csr =
 		cardbus_conf_read(cc, cf, ca-ca_tag, SIISATA_CARDBUS_BAR0);
 		base = PCI_MAPREG_MEM_ADDR(csr);
-		memt = cbsc-sc_memt;
-		if ((*cf-cardbus_space_alloc)(cc, cbsc-sc_rbus_memt, base,
+		memt = csc-sc_memt;
+		if ((*cf-cardbus_space_alloc)(cc, csc-sc_rbus_memt, base,
 		grsize, grsize - 1, grsize, 0, base, memh)) {
 			aprint_error(
 			%s: unable to map device global registers\n,
@@ -193,12 +205,12 @@
 		prsize = SIISATA_BAR1_SIZE;
 		base = PCI_MAPREG_MEM_ADDR(cardbus_conf_read(cc, cf, ca-ca_tag,
 		SIISATA_CARDBUS_BAR1));
-		memt = cbsc-sc_memt;
-		if ((*cf-cardbus_space_alloc)(cc, cbsc-sc_rbus_memt, base,
+		memt = csc-sc_memt;
+		if ((*cf-cardbus_space_alloc)(cc, csc-sc_rbus_memt, base,
 		prsize, prsize - 1, prsize, 0, base, memh)) {
 			cardbus_conf_write(cc, cf, ca-ca_tag,
 			SIISATA_CARDBUS_BAR0, 0);
-			(*cf-cardbus_space_free)(cc, cbsc-sc_rbus_memt,
+			(*cf-cardbus_space_free)(cc, csc-sc_rbus_memt,
 			sc-sc_grh, grsize);
 			aprint_error(
 			%s: unable to map device port registers\n,
@@ -219,10 +231,10 @@
 	siisata_intr, sc);
 	if (csc-sc_ih == NULL) {
 		cardbus_conf_write(cc, cf, ca-ca_tag, SIISATA_CARDBUS_BAR0, 0);
-		(*cf-cardbus_space_free)(cc, cbsc-sc_rbus_memt, sc-sc_grh,
+		(*cf-cardbus_space_free)(cc, csc-sc_rbus_memt, sc-sc_grh,
 		grsize);
 		cardbus_conf_write(cc, cf, ca-ca_tag, SIISATA_CARDBUS_BAR1, 0);
-		(*cf-cardbus_space_free)(cc, cbsc-sc_rbus_memt, sc-sc_prh,
+		(*cf-cardbus_space_free)(cc, csc-sc_rbus_memt, sc-sc_prh,
 		prsize);
 		aprint_error(%s: couldn't establish interrupt\n,
 		SIISATANAME(sc));
@@ -265,7 +277,6 @@
 static int
 siisata_cardbus_detach(device_t self, int flags)
 {
-	struct cardbus_softc *cbsc = device_private(device_parent(self));
 	struct siisata_cardbus_softc *csc = device_private(self);
 	struct siisata_softc *sc = csc-si_sc;
 	struct cardbus_devfunc *ct = csc-sc_ct;
@@ -283,13 +294,13 @@
 	}
 	if (csc-sc_grsize) {
 		cardbus_conf_write(cc, cf, ctag, SIISATA_CARDBUS_BAR0, 0);
-		(*cf-cardbus_space_free)(cc, cbsc-sc_rbus_memt, sc-sc_grh,
+		(*cf-cardbus_space_free)(cc, csc-sc_rbus_memt, sc-sc_grh,
 		csc-sc_grsize);
 		csc-sc_grsize = 0;
 	}
 	if (csc-sc_prsize) {
 		cardbus_conf_write(cc, cf, ctag, SIISATA_CARDBUS_BAR1, 0);
-		(*cf-cardbus_space_free)(cc, cbsc-sc_rbus_memt, sc-sc_prh,
+		(*cf-cardbus_space_free)(cc, csc-sc_rbus_memt, sc-sc_prh,
 		csc-sc_prsize);
 		csc-sc_prsize = 0;
 	}

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 23:01:48 UTC 2010

Modified Files:
src/sys/dev/cardbus: if_rtw_cardbus.c

Log Message:
Use PCI_ constants instead of CARDBUS_ constants.  Use Cardbus_conf_*()
functions instead of cardbus_conf_*() functions to simplify some
code.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/cardbus/if_rtw_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/uvm

2010-02-25 Thread Jean-Yves Migeon

Module Name:src
Committed By:   jym
Date:   Thu Feb 25 23:10:49 UTC 2010

Modified Files:
src/sys/uvm: uvm_glue.c

Log Message:
Change RSS (resident set size) limit. Instead of setting it arbitrarily
to the total free memory available to the system, use the smallest value
between VM_MAXUSER_ADDRESS and total free memory (having a RSS limit
bigger than VM_MAXUSER_ADDRESS has no real meaning).

Fix a possible int overflow when ptoa(uvmexp.free) is bigger than 4GB
with a 32 bits vaddr_t.

Reviewed by bou...@.

See also http://mail-index.netbsd.org/tech-kern/2010/02/24/msg007395.html


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/uvm/uvm_glue.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.143 src/sys/uvm/uvm_glue.c:1.144
--- src/sys/uvm/uvm_glue.c:1.143	Thu Dec 17 01:25:11 2009
+++ src/sys/uvm/uvm_glue.c	Thu Feb 25 23:10:49 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_glue.c,v 1.143 2009/12/17 01:25:11 rmind Exp $	*/
+/*	$NetBSD: uvm_glue.c,v 1.144 2010/02/25 23:10:49 jym Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -67,7 +67,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_glue.c,v 1.143 2009/12/17 01:25:11 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_glue.c,v 1.144 2010/02/25 23:10:49 jym Exp $);
 
 #include opt_kgdb.h
 #include opt_kstack.h
@@ -407,7 +407,8 @@
 	p-p_rlimit[RLIMIT_DATA].rlim_max = maxdmap;
 	p-p_rlimit[RLIMIT_AS].rlim_cur = RLIM_INFINITY;
 	p-p_rlimit[RLIMIT_AS].rlim_max = RLIM_INFINITY;
-	p-p_rlimit[RLIMIT_RSS].rlim_cur = ptoa(uvmexp.free);
+	p-p_rlimit[RLIMIT_RSS].rlim_cur = MIN(
+	VM_MAXUSER_ADDRESS, ctob((rlim_t)uvmexp.free));
 }
 
 /*

Re: src/share/man/man4 vs crash(8)

2010-02-25 Thread Izumi Tsutsui

 Well, as you quote, we have too many :)
 Perhaps the content of the hp300 and vax ones can be moved somewhere
 else?

Old MD crash(8) mentions generic UNIX system failures as
boot(8) mentions bootstrapping procedures.
New MI crash(8) is a new command, and conflicts with old ones.

They have completely different contents and probably
the former should be renamed.
---
Izumi Tsutsui

CVS commit: src/sys/arch/powerpc/include

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:30:05 UTC 2010

Modified Files:
src/sys/arch/powerpc/include: spr.h
src/sys/arch/powerpc/include/ibm4xx: Makefile
src/sys/arch/powerpc/include/oea: Makefile
Added Files:
src/sys/arch/powerpc/include/ibm4xx: spr.h
src/sys/arch/powerpc/include/oea: spr.h

Log Message:
Split powerpc/spr.h into a common powerpc/spr.h and powerpc/XXX/spr.h
where XXX is ibm4xx or oea.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/powerpc/include/spr.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/ibm4xx/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/ibm4xx/spr.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/include/oea/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/oea/spr.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/powerpc/include/spr.h
diff -u src/sys/arch/powerpc/include/spr.h:1.44 src/sys/arch/powerpc/include/spr.h:1.45
--- src/sys/arch/powerpc/include/spr.h:1.44	Sat Feb 23 19:54:54 2008
+++ src/sys/arch/powerpc/include/spr.h	Thu Feb 25 23:30:04 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: spr.h,v 1.44 2008/02/23 19:54:54 matt Exp $	*/
+/*	$NetBSD: spr.h,v 1.45 2010/02/25 23:30:04 matt Exp $	*/
 
 #ifndef _POWERPC_SPR_H_
 #define	_POWERPC_SPR_H_
@@ -17,524 +17,31 @@
 /*
  * Special Purpose Register declarations.
  *
- * The first column in the comments indicates which PowerPC
- * architectures the SPR is valid on - 4 for 4xx series,
- * 6 for 6xx/7xx series and 8 for 8xx and 8xxx series.
+ * The first column in the comments indicates which PowerPC architectures the
+ * SPR is valid on - E for BookE series, 4 for 4xx series,
+ * 6 for 6xx/7xx series and 8 for 8xx and 8xxx (but not 85xx) series.
  */
 
-#define	SPR_MQ			0x000	/* .6. 601 MQ register */
-#define	SPR_XER			0x001	/* 468 Fixed Point Exception Register */
-#define	SPR_RTCU_R		0x004	/* .6. 601 RTC Upper - Read */
-#define	SPR_RTCL_R		0x005	/* .6. 601 RTC Lower - Read */
-#define	SPR_LR			0x008	/* 468 Link Register */
-#define	SPR_CTR			0x009	/* 468 Count Register */
-#define	SPR_DSISR		0x012	/* .68 DSI exception source */
-#define	  DSISR_DIRECT		  0x8000 /* Direct-store error exception */
-#define	  DSISR_NOTFOUND	  0x4000 /* Translation not found */
-#define	  DSISR_PROTECT		  0x0800 /* Memory access not permitted */
-#define	  DSISR_INVRX		  0x0400 /* Reserve-indexed insn direct-store access */
-#define	  DSISR_STORE		  0x0200 /* Store operation */
-#define	  DSISR_DABR		  0x0040 /* DABR match */
-#define	  DSISR_SEGMENT		  0x0020 /* XXX; not in 6xx PEM */
-#define	  DSISR_EAR		  0x0010 /* eciwx/ecowx  EAR[E] == 0 */
-#define	SPR_DAR			0x013	/* .68 Data Address Register */
-#define	SPR_RTCU_W		0x014	/* .6. 601 RTC Upper - Write */
-#define	SPR_RTCL_W		0x015	/* .6. 601 RTC Lower - Write */
-#define	SPR_DEC			0x016	/* .68 DECrementer register */
-#define	SPR_SDR1		0x019	/* .68 Page table base address register */
-#define	SPR_SRR0		0x01a	/* 468 Save/Restore Register 0 */
-#define	SPR_SRR1		0x01b	/* 468 Save/Restore Register 1 */
-#define	SPR_44XPID		0x030	/* 4.. 440 Process ID */
-#define SPR_EIE			0x050	/* ..8 Exception Interrupt ??? */
-#define SPR_EID			0x051	/* ..8 Exception Interrupt ??? */
-#define SPR_NRI			0x052	/* ..8 Exception Interrupt ??? */
-#define	SPR_USPRG0		0x100	/* 4.. User SPR General 0 */
-#define	SPR_VRSAVE		0x100	/* .6. AltiVec VRSAVE */
-#define	SPR_SPRG0		0x110	/* 468 SPR General 0 */
-#define	SPR_SPRG1		0x111	/* 468 SPR General 1 */
-#define	SPR_SPRG2		0x112	/* 468 SPR General 2 */
-#define	SPR_SPRG3		0x113	/* 468 SPR General 3 */
-#define	SPR_SPRG4		0x114	/* 4.. SPR General 4 */
-#define	SPR_SPRG5		0x115	/* 4.. SPR General 5 */
-#define	SPR_SPRG6		0x116	/* 4.. SPR General 6 */
-#define	SPR_SPRG7		0x117	/* 4.. SPR General 7 */
-#define	SPR_ASR			0x118	/* ... Address Space Register (PPC64) */
-#define	SPR_EAR			0x11a	/* .68 External Access Register */
-#define	SPR_TBL			0x11c	/* 468 Time Base Lower */
-#define	SPR_TBU			0x11d	/* 468 Time Base Upper */
-#define	SPR_PVR			0x11f	/* 468 Processor Version Register */
-#define	  MPC601		  0x0001
-#define	  MPC603		  0x0003
-#define	  MPC604		  0x0004
-#define	  MPC602		  0x0005
-#define	  MPC603e		  0x0006
-#define	  MPC603ev		  0x0007
-#define	  MPC750		  0x0008
-#define	  MPC604e		  0x0009
-#define	  MPC604ev		  0x000a
-#define	  MPC7400		  0x000c
-#define	  MPC620		  0x0014
-#define	  IBM403		  0x0020
-#define	  IBM401A1		  0x0021
-#define	  IBM401B2		  0x0022
-#define	  IBM401C2		  0x0023
-#define	  IBM401D2		  0x0024
-#define	  IBM401E2		  0x0025
-#define	  IBM401F2		  0x0026
-#define	  IBM401G2		  0x0027
-#define   IBMRS64II		  0x0033
-#define   IBMRS64IIIp		  0x0034
-#define   IBMPOWER4		  0x0035
-#define   IBMRS64IIIi		  0x0036
-#define   IBMRS64IV		  0x0037
-#define   IBMPOWER4II

CVS commit: src/sys/arch/powerpc

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:31:48 UTC 2010

Modified Files:
src/sys/arch/powerpc/ibm4xx: clock.c ibm4xx_machdep.c intr.c pmap.c
trap.c
src/sys/arch/powerpc/ibm4xx/dev: opb.c wdog.c
src/sys/arch/powerpc/ibm4xx/openbios: locore.S
src/sys/arch/powerpc/include: cpu_counter.h
src/sys/arch/powerpc/oea: altivec.c cpu_subr.c oea_machdep.c pmap.c
src/sys/arch/powerpc/powerpc: bus_space.c clock.c db_interface.c
db_trace.c trap.c

Log Message:
Adapt to spr.h breakup.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/ibm4xx/clock.c \
src/sys/arch/powerpc/ibm4xx/intr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/powerpc/ibm4xx/pmap.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/powerpc/ibm4xx/trap.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/ibm4xx/dev/opb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/ibm4xx/dev/wdog.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/ibm4xx/openbios/locore.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/cpu_counter.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/oea/altivec.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/powerpc/clock.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/powerpc/powerpc/db_interface.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/powerpc/powerpc/db_trace.c
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/powerpc/powerpc/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/powerpc/ibm4xx/clock.c
diff -u src/sys/arch/powerpc/ibm4xx/clock.c:1.21 src/sys/arch/powerpc/ibm4xx/clock.c:1.22
--- src/sys/arch/powerpc/ibm4xx/clock.c:1.21	Wed Jan  9 06:50:36 2008
+++ src/sys/arch/powerpc/ibm4xx/clock.c	Thu Feb 25 23:31:47 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.21 2008/01/09 06:50:36 simonb Exp $	*/
+/*	$NetBSD: clock.c,v 1.22 2010/02/25 23:31:47 matt Exp $	*/
 /*  $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.21 2008/01/09 06:50:36 simonb Exp $);
+__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.22 2010/02/25 23:31:47 matt Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -47,6 +47,7 @@
 #include machine/cpu.h
 
 #include powerpc/spr.h
+#include powerpc/ibm4xx/spr.h
 
 /*
  * Initially we assume a processor with a bus frequency of 12.5 MHz.
Index: src/sys/arch/powerpc/ibm4xx/intr.c
diff -u src/sys/arch/powerpc/ibm4xx/intr.c:1.21 src/sys/arch/powerpc/ibm4xx/intr.c:1.22
--- src/sys/arch/powerpc/ibm4xx/intr.c:1.21	Sun Jan  4 15:34:18 2009
+++ src/sys/arch/powerpc/ibm4xx/intr.c	Thu Feb 25 23:31:47 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.21 2009/01/04 15:34:18 tsutsui Exp $	*/
+/*	$NetBSD: intr.c,v 1.22 2010/02/25 23:31:47 matt Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.21 2009/01/04 15:34:18 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.22 2010/02/25 23:31:47 matt Exp $);
 
 #include sys/param.h
 #include sys/malloc.h
@@ -50,6 +50,7 @@
 
 #include powerpc/cpu.h
 #include powerpc/spr.h
+#include powerpc/ibm4xx/spr.h
 
 
 /*

Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.12 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.13
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.12	Fri Nov 27 03:23:12 2009
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c	Thu Feb 25 23:31:47 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibm4xx_machdep.c,v 1.12 2009/11/27 03:23:12 rmind Exp $	*/
+/*	$NetBSD: ibm4xx_machdep.c,v 1.13 2010/02/25 23:31:47 matt Exp $	*/
 /*	Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ibm4xx_machdep.c,v 1.12 2009/11/27 03:23:12 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ibm4xx_machdep.c,v 1.13 2010/02/25 23:31:47 matt Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_ddb.h
@@ -96,6 +96,7 @@
 
 #include machine/powerpc.h
 #include powerpc/spr.h
+#include powerpc/ibm4xx/spr.h
 #include machine/trap.h
 
 /*

Index: src/sys/arch/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.61 src/sys/arch/powerpc/ibm4xx/pmap.c:1.62
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.61	Thu Feb 25 07:21:19 2010
+++ src/sys/arch/powerpc/ibm4xx/pmap.c	Thu Feb 25 23:31:47 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.61 2010/02/25 07:21:19 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.62 2010/02/25 23:31:47 matt Exp $	*/
 
 /*
  * Copyright 2001 Wasabi

CVS commit: src/sys/arch/powerpc

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:31:48 UTC 2010

Modified Files:
src/sys/arch/powerpc/ibm4xx: clock.c ibm4xx_machdep.c intr.c pmap.c
trap.c
src/sys/arch/powerpc/ibm4xx/dev: opb.c wdog.c
src/sys/arch/powerpc/ibm4xx/openbios: locore.S
src/sys/arch/powerpc/include: cpu_counter.h
src/sys/arch/powerpc/oea: altivec.c cpu_subr.c oea_machdep.c pmap.c
src/sys/arch/powerpc/powerpc: bus_space.c clock.c db_interface.c
db_trace.c trap.c

Log Message:
Adapt to spr.h breakup.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/ibm4xx/clock.c \
src/sys/arch/powerpc/ibm4xx/intr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/powerpc/ibm4xx/pmap.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/powerpc/ibm4xx/trap.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/ibm4xx/dev/opb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/ibm4xx/dev/wdog.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/ibm4xx/openbios/locore.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/cpu_counter.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/oea/altivec.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/powerpc/clock.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/powerpc/powerpc/db_interface.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/powerpc/powerpc/db_trace.c
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/powerpc/powerpc/trap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:33:45 UTC 2010

Modified Files:
src/sys/arch/amigappc/amigappc: locore.S
src/sys/arch/bebox/bebox: locore.S
src/sys/arch/evbppc/ev64260: ev64260_locore.S
src/sys/arch/evbppc/explora: explora_start.S machdep.c
src/sys/arch/evbppc/obs405: obs200_locore.S obs200_machdep.c
obs266_machdep.c
src/sys/arch/evbppc/pmppc: pmppc_locore.S
src/sys/arch/evbppc/virtex: machdep.c virtex_start.S
src/sys/arch/evbppc/walnut: machdep.c walnut_start.S
src/sys/arch/ibmnws/ibmnws: locore.S
src/sys/arch/macppc/dev: if_bm.c
src/sys/arch/macppc/macppc: locore.S
src/sys/arch/mvmeppc/mvmeppc: locore.S
src/sys/arch/ofppc/ofppc: locore.S machdep.c
src/sys/arch/rs6000/rs6000: locore.S
src/sys/arch/sandpoint/sandpoint: locore.S

Log Message:
Adapt to spr.h breakup.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/explora/explora_start.S
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/obs405/obs200_locore.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/obs200_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/obs405/obs266_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/virtex_start.S
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/walnut/walnut_start.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/macppc/dev/if_bm.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/macppc/macppc/locore.S
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/ofppc/ofppc/machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sandpoint/sandpoint/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:33:45 UTC 2010

Modified Files:
src/sys/arch/amigappc/amigappc: locore.S
src/sys/arch/bebox/bebox: locore.S
src/sys/arch/evbppc/ev64260: ev64260_locore.S
src/sys/arch/evbppc/explora: explora_start.S machdep.c
src/sys/arch/evbppc/obs405: obs200_locore.S obs200_machdep.c
obs266_machdep.c
src/sys/arch/evbppc/pmppc: pmppc_locore.S
src/sys/arch/evbppc/virtex: machdep.c virtex_start.S
src/sys/arch/evbppc/walnut: machdep.c walnut_start.S
src/sys/arch/ibmnws/ibmnws: locore.S
src/sys/arch/macppc/dev: if_bm.c
src/sys/arch/macppc/macppc: locore.S
src/sys/arch/mvmeppc/mvmeppc: locore.S
src/sys/arch/ofppc/ofppc: locore.S machdep.c
src/sys/arch/rs6000/rs6000: locore.S
src/sys/arch/sandpoint/sandpoint: locore.S

Log Message:
Adapt to spr.h breakup.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/explora/explora_start.S
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/obs405/obs200_locore.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/obs200_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/obs405/obs266_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/virtex_start.S
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/walnut/walnut_start.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/macppc/dev/if_bm.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/macppc/macppc/locore.S
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/ofppc/ofppc/machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sandpoint/sandpoint/locore.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/amigappc/amigappc/locore.S
diff -u src/sys/arch/amigappc/amigappc/locore.S:1.18 src/sys/arch/amigappc/amigappc/locore.S:1.19
--- src/sys/arch/amigappc/amigappc/locore.S:1.18	Tue Feb  2 20:56:13 2010
+++ src/sys/arch/amigappc/amigappc/locore.S	Thu Feb 25 23:33:43 2010
@@ -1,4 +1,4 @@
-/*  $NetBSD: locore.S,v 1.18 2010/02/02 20:56:13 phx Exp $   */
+/*  $NetBSD: locore.S,v 1.19 2010/02/25 23:33:43 matt Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -54,8 +54,9 @@
 #define _NOREGNAMES
 #include machine/asm.h
 
-#include powerpc/oea/hid.h
 #include powerpc/spr.h
+#include powerpc/oea/spr.h
+#include powerpc/oea/hid.h
 #include amiga/amiga/custom.h
 #include amigappc/amigappc/p5reg.h
 

Index: src/sys/arch/bebox/bebox/locore.S
diff -u src/sys/arch/bebox/bebox/locore.S:1.19 src/sys/arch/bebox/bebox/locore.S:1.20
--- src/sys/arch/bebox/bebox/locore.S:1.19	Thu Nov 26 00:19:13 2009
+++ src/sys/arch/bebox/bebox/locore.S	Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.19 2009/11/26 00:19:13 matt Exp $	*/
+/*	$NetBSD: locore.S,v 1.20 2010/02/25 23:33:44 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/
 
 /*
@@ -53,6 +53,7 @@
 #include machine/asm.h
 
 #include powerpc/spr.h
+#include powerpc/oea/spr.h
 
 /*
  * Some instructions gas doesn't understand (yet?)

Index: src/sys/arch/evbppc/ev64260/ev64260_locore.S
diff -u src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.12 src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.13
--- src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.12	Thu Nov 26 00:19:16 2009
+++ src/sys/arch/evbppc/ev64260/ev64260_locore.S	Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ev64260_locore.S,v 1.12 2009/11/26 00:19:16 matt Exp $	*/
+/*	$NetBSD: ev64260_locore.S,v 1.13 2010/02/25 23:33:44 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/
 
 /*
@@ -52,6 +52,7 @@
 #include machine/asm.h
 
 #include powerpc/spr.h
+#include powerpc/oea/spr.h
 #include powerpc/oea/bat.h
 #include powerpc/oea/hid.h
 

Index: src/sys/arch/evbppc/explora/explora_start.S
diff -u src/sys/arch/evbppc/explora/explora_start.S:1.6 src/sys/arch/evbppc/explora/explora_start.S:1.7
--- src/sys/arch/evbppc/explora/explora_start.S:1.6	Thu Nov 26 00:19:16 2009
+++ src/sys/arch/evbppc/explora/explora_start.S	Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: explora_start.S,v 1.6 2009/11/26 00:19:16 matt Exp $	*/
+/*	$NetBSD: explora_start.S,v 1.7 2010/02/25 23:33:44

CVS commit: src/sys/dev/marvell

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:34:54 UTC 2010

Modified Files:
src/sys/dev/marvell: gt.c

Log Message:
Adapt to powerpc/spr.h breakup.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/marvell/gt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/marvell

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:34:54 UTC 2010

Modified Files:
src/sys/dev/marvell: gt.c

Log Message:
Adapt to powerpc/spr.h breakup.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/marvell/gt.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/marvell/gt.c
diff -u src/sys/dev/marvell/gt.c:1.21 src/sys/dev/marvell/gt.c:1.22
--- src/sys/dev/marvell/gt.c:1.21	Tue May 12 14:30:25 2009
+++ src/sys/dev/marvell/gt.c	Thu Feb 25 23:34:54 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: gt.c,v 1.21 2009/05/12 14:30:25 cegger Exp $	*/
+/*	$NetBSD: gt.c,v 1.22 2010/02/25 23:34:54 matt Exp $	*/
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gt.c,v 1.21 2009/05/12 14:30:25 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: gt.c,v 1.22 2010/02/25 23:34:54 matt Exp $);
 
 #include opt_marvell.h
 #include locators.h
@@ -60,6 +60,7 @@
 
 #include powerpc/spr.h
 #include powerpc/oea/hid.h
+#include powerpc/oea/spr.h
 
 #include dev/marvell/gtreg.h
 #include dev/marvell/gtintrreg.h

CVS commit: src/lib/libkvm

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:35:29 UTC 2010

Modified Files:
src/lib/libkvm: kvm_powerpc.c

Log Message:
Adapt to powerpc/spr.h breakup.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libkvm/kvm_powerpc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libkvm/kvm_powerpc.c
diff -u src/lib/libkvm/kvm_powerpc.c:1.8 src/lib/libkvm/kvm_powerpc.c:1.9
--- src/lib/libkvm/kvm_powerpc.c:1.8	Tue Jan 15 13:57:42 2008
+++ src/lib/libkvm/kvm_powerpc.c	Thu Feb 25 23:35:29 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_powerpc.c,v 1.8 2008/01/15 13:57:42 ad Exp $	*/
+/*	$NetBSD: kvm_powerpc.c,v 1.9 2010/02/25 23:35:29 matt Exp $	*/
 
 /*
  * Copyright (c) 2005 Wasabi Systems, Inc.
@@ -86,6 +86,7 @@
 #include machine/kcore.h
 
 #include powerpc/spr.h
+#include powerpc/oea/spr.h
 #include powerpc/oea/bat.h
 #include powerpc/oea/pte.h

CVS commit: src/lib/libkvm

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:35:29 UTC 2010

Modified Files:
src/lib/libkvm: kvm_powerpc.c

Log Message:
Adapt to powerpc/spr.h breakup.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libkvm/kvm_powerpc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/sets/lists/comp

2010-02-25 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb 25 23:36:31 UTC 2010

Modified Files:
src/distrib/sets/lists/comp: ad.powerpc

Log Message:
Add powerpc/ibm4xx/spr.h and powerpc/oea.spr.h


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/comp/ad.powerpc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/dm

2010-02-25 Thread Adam Hamsik

Module Name:src
Committed By:   haad
Date:   Thu Feb 25 23:37:39 UTC 2010

Modified Files:
src/sys/dev/dm: device-mapper.c

Log Message:
Fix device-mapper to work in builtin case. This commit fixes

PR: 42799

REwork fix commited by jak@ to be more readable and remove unneeded ifdef 
_MODULE.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/dm/device-mapper.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/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.16 src/sys/dev/dm/device-mapper.c:1.17
--- src/sys/dev/dm/device-mapper.c:1.16	Thu Feb 25 20:48:58 2010
+++ src/sys/dev/dm/device-mapper.c	Thu Feb 25 23:37:39 2010
@@ -1,7 +1,7 @@
-/*$NetBSD: device-mapper.c,v 1.16 2010/02/25 20:48:58 jakllsch Exp $ */
+/*$NetBSD: device-mapper.c,v 1.17 2010/02/25 23:37:39 haad Exp $ */
 
 /*
- * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -46,6 +46,7 @@
 #include sys/ioccom.h
 #include sys/kmem.h
 #include sys/module.h
+#include sys/once.h
 
 #include netbsd-dm.h
 #include dm.h
@@ -59,10 +60,9 @@
 static dev_type_size(dmsize);
 
 /* attach and detach routines */
-void dmattach(int);
-void dmdestroy(void);
+int dmattach(void);
+int dmdestroy(void);
 
-static void dm_init(void);
 static int dm_cmd_to_fun(prop_dictionary_t);
 static int disk_ioctl_switch(dev_t, u_long, void *);
 static int dm_ioctl_switch(u_long);
@@ -149,9 +149,7 @@
 static int
 dm_modcmd(modcmd_t cmd, void *arg)
 {
-#ifdef _MODULE
-	int error;
-	int bmajor, cmajor;
+	int error, bmajor, cmajor;
 
 	error = 0;
 	bmajor = -1;
@@ -163,7 +161,7 @@
 		if (error)
 			break;
 
-		error = config_cfattach_attach(dm_cd.cd_name, dm_ca);
+		error = dmattach();
 		if (error) {
 			config_cfdriver_detach(dm_cd);
 			aprint_error(%s: unable to register cfattach\n,
@@ -178,9 +176,6 @@
 			config_cfdriver_detach(dm_cd);
 			break;
 		}
-
-		dm_init();
-
 		break;
 
 	case MODULE_CMD_FINI:
@@ -192,9 +187,8 @@
 		 */ 
 		if (dm_dev_counter  0)
 			return EBUSY;
-		dmdestroy();
 
-		error = config_cfattach_detach(dm_cd.cd_name, dm_ca);
+		error = dmdestroy();
 		if (error)
 			break;
 
@@ -210,13 +204,6 @@
 	}
 
 	return error;
-#else
-
-	if (cmd == MODULE_CMD_INIT)
-		return 0;
-	return ENOTTY;
-
-#endif /* _MODULE */
 }
 
 
@@ -284,31 +271,48 @@
 	return 0;
 }
 
-/* attach routine */
-void
-dmattach(int num)
+static int
+doinit(void)
 {
 	int error;
-
+	
 	error = config_cfattach_attach(dm_cd.cd_name, dm_ca);
 	if (error) {
-		aprint_error(%s: unable to register cfattach\n,
-		dm_cd.cd_name);
-		return;
+		aprint_error(Unable to register cfattach for dm driver\n);
+		return error;
 	}
+	
+	dm_target_init();
+	dm_dev_init();
+	dm_pdev_init();
 
-	dm_init();
+	return 0;
+}
+
+/* attach routine */
+int
+dmattach(void)
+{
+	static ONCE_DECL(control);
+
+	return RUN_ONCE(control, doinit);
 }
 
 /* Destroy routine */
-void
+int
 dmdestroy(void)
 {
+	int error;
 
+	error = config_cfattach_detach(dm_cd.cd_name, dm_ca);
+	if (error)
+		return error;
+	
 	dm_dev_destroy();
 	dm_pdev_destroy();
 	dm_target_destroy();
 
+	return 0;
 }
 
 static int
@@ -366,14 +370,6 @@
 	return r;
 }
 
-static void
-dm_init(void)
-{
-	dm_target_init();
-	dm_dev_init();
-	dm_pdev_init();
-}
-
 /*
  * Translate command sent from libdevmapper to func.
  */

CVS commit: src/sys/dev/dm

2010-02-25 Thread Adam Hamsik

Module Name:src
Committed By:   haad
Date:   Thu Feb 25 23:37:39 UTC 2010

Modified Files:
src/sys/dev/dm: device-mapper.c

Log Message:
Fix device-mapper to work in builtin case. This commit fixes

PR: 42799

REwork fix commited by jak@ to be more readable and remove unneeded ifdef 
_MODULE.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/dm/device-mapper.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 23:40:39 UTC 2010

Modified Files:
src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c com_cardbus.c
ehci_cardbus.c fwohci_cardbus.c if_ath_cardbus.c if_atw_cardbus.c
if_ex_cardbus.c if_fxp_cardbus.c if_ral_cardbus.c if_re_cardbus.c
if_rtk_cardbus.c if_tlp_cardbus.c njata_cardbus.c njs_cardbus.c
ohci_cardbus.c rbus_ppb.c uhci_cardbus.c
src/sys/dev/ic: i82557.c i82557var.h

Log Message:
Make fxp at cardbus detach during shutdown.

Stop calling (*cardbus_ctrl) to enable bus mastering, I/O and memory
spaces on the CardBus bridge.  cbb(4) always enables that stuff,
anyway.  In the process, avoid remembering what BAR we mapped by
writing CARDBUS_{IO,MEM}_ENABLE to sc_cben or sc_cbenable, and
record the BAR in use sc_bar, instead.

Replace more CARDBUS_ constants with PCI_ constants.

Compile-tested, only.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/cardbus/ahc_cardbus.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/cardbus/fwohci_cardbus.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/cardbus/if_atw_cardbus.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/cardbus/if_ral_cardbus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/cardbus/if_re_cardbus.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/cardbus/if_tlp_cardbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/cardbus/njata_cardbus.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/cardbus/njs_cardbus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/ohci_cardbus.c \
src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/ic/i82557.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/i82557var.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Thu Feb 25 23:40:39 UTC 2010

Modified Files:
src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c com_cardbus.c
ehci_cardbus.c fwohci_cardbus.c if_ath_cardbus.c if_atw_cardbus.c
if_ex_cardbus.c if_fxp_cardbus.c if_ral_cardbus.c if_re_cardbus.c
if_rtk_cardbus.c if_tlp_cardbus.c njata_cardbus.c njs_cardbus.c
ohci_cardbus.c rbus_ppb.c uhci_cardbus.c
src/sys/dev/ic: i82557.c i82557var.h

Log Message:
Make fxp at cardbus detach during shutdown.

Stop calling (*cardbus_ctrl) to enable bus mastering, I/O and memory
spaces on the CardBus bridge.  cbb(4) always enables that stuff,
anyway.  In the process, avoid remembering what BAR we mapped by
writing CARDBUS_{IO,MEM}_ENABLE to sc_cben or sc_cbenable, and
record the BAR in use sc_bar, instead.

Replace more CARDBUS_ constants with PCI_ constants.

Compile-tested, only.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/cardbus/ahc_cardbus.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/cardbus/fwohci_cardbus.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/cardbus/if_atw_cardbus.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/cardbus/if_ral_cardbus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/cardbus/if_re_cardbus.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/cardbus/if_tlp_cardbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/cardbus/njata_cardbus.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/cardbus/njs_cardbus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/ohci_cardbus.c \
src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/ic/i82557.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/i82557var.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/cardbus/adv_cardbus.c
diff -u src/sys/dev/cardbus/adv_cardbus.c:1.23 src/sys/dev/cardbus/adv_cardbus.c:1.24
--- src/sys/dev/cardbus/adv_cardbus.c:1.23	Wed Feb 24 19:52:51 2010
+++ src/sys/dev/cardbus/adv_cardbus.c	Thu Feb 25 23:40:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: adv_cardbus.c,v 1.23 2010/02/24 19:52:51 dyoung Exp $	*/
+/*	$NetBSD: adv_cardbus.c,v 1.24 2010/02/25 23:40:39 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: adv_cardbus.c,v 1.23 2010/02/24 19:52:51 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: adv_cardbus.c,v 1.24 2010/02/25 23:40:39 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -76,7 +76,7 @@
 	cardbus_devfunc_t sc_ct;	/* our CardBus devfuncs */
 	pcitag_t sc_tag;
 
-	int	sc_cbenable;		/* what CardBus access type to enable */
+	int	sc_bar;
 	int	sc_csr;			/* CSR bits */
 	bus_size_t sc_size;
 };
@@ -150,7 +150,6 @@
 
 	csc-sc_ct = ct;
 	csc-sc_tag = ca-ca_tag;
-	csc-sc_cbenable = 0;
 
 	/*
 	 * Map the device.
@@ -164,7 +163,7 @@
 #ifdef ADV_CARDBUS_DEBUG
 		printf(%s: memio enabled\n, DEVNAME(sc));
 #endif
-		csc-sc_cbenable = CARDBUS_MEM_ENABLE;
+		csc-sc_bar = ADV_CARDBUS_MMBA;
 		csc-sc_csr |= PCI_COMMAND_MEM_ENABLE;
 	} else
 #endif
@@ -173,17 +172,14 @@
 #ifdef ADV_CARDBUS_DEBUG
 		printf(%s: io enabled\n, DEVNAME(sc));
 #endif
-		csc-sc_cbenable = CARDBUS_IO_ENABLE;
+		csc-sc_bar = ADV_CARDBUS_IOBA;
 		csc-sc_csr |= PCI_COMMAND_IO_ENABLE;
 	} else {
+		csc-sc_bar = 0;
 		aprint_error_dev(sc-sc_dev, unable to map device registers\n);
 		return;
 	}
 
-	/* Make sure the right access type is on the CardBus bridge. */
-	(*ct-ct_cf-cardbus_ctrl)(cc, csc-sc_cbenable);
-	(*ct-ct_cf-cardbus_ctrl)(cc, CARDBUS_BM_ENABLE);
-
 	/* Enable the appropriate bits in the PCI CSR. */
 	reg = cardbus_conf_read(cc, cf, ca-ca_tag, PCI_COMMAND_STATUS_REG);
 	reg = ~(PCI_COMMAND_IO_ENABLE|PCI_COMMAND_MEM_ENABLE);
@@ -254,19 +250,10 @@
 		sc-sc_ih = 0;
 	}
 
-	if (csc-sc_cbenable) {
-#ifdef ADV_CARDBUS_ALLOW_MEMIO
-		if (csc-sc_cbenable == CARDBUS_MEM_ENABLE) {
-			Cardbus_mapreg_unmap(csc-sc_ct, ADV_CARDBUS_MMBA,
-			sc-sc_iot, sc-sc_ioh, csc-sc_size);
-		} else {
-#endif
-			Cardbus_mapreg_unmap(csc-sc_ct, ADV_CARDBUS_IOBA,
-			sc-sc_iot, sc-sc_ioh, csc-sc_size);
-#ifdef ADV_CARDBUS_ALLOW_MEMIO
-		}
-#endif
-		csc-sc_cbenable = 0;
+	if (csc-sc_bar != 0) {
+		Cardbus_mapreg_unmap(csc-sc_ct, csc-sc_bar,
+		sc-sc_iot, sc-sc_ioh, csc-sc_size);
+		csc-sc_bar = 0;
 	}
 
 	return 0;

Index: src/sys/dev/cardbus/ahc_cardbus.c
diff -u src/sys/dev/cardbus/ahc_cardbus.c:1.30

CVS commit: src/lib/libterminfo

2010-02-25 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Thu Feb 25 23:44:02 UTC 2010

Modified Files:
src/lib/libterminfo: compile.c

Log Message:
If we only have a name then we flatten to an alias.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libterminfo/compile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/lib/libterminfo

2010-02-25 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Thu Feb 25 23:44:02 UTC 2010

Modified Files:
src/lib/libterminfo: compile.c

Log Message:
If we only have a name then we flatten to an alias.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libterminfo/compile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libterminfo/compile.c
diff -u src/lib/libterminfo/compile.c:1.1 src/lib/libterminfo/compile.c:1.2
--- src/lib/libterminfo/compile.c:1.1	Mon Feb 22 23:05:39 2010
+++ src/lib/libterminfo/compile.c	Thu Feb 25 23:44:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compile.c,v 1.1 2010/02/22 23:05:39 roy Exp $ */
+/* $NetBSD: compile.c,v 1.2 2010/02/25 23:44:02 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #endif
 
 #include sys/cdefs.h
-__RCSID($NetBSD: compile.c,v 1.1 2010/02/22 23:05:39 roy Exp $);
+__RCSID($NetBSD: compile.c,v 1.2 2010/02/25 23:44:02 roy Exp $);
 
 #include assert.h
 #include ctype.h
@@ -235,7 +235,12 @@
 		return -1;
 	
 	cap = *buf;
-	*cap++ = 2; /* version */
+	if (alen == 0  dlen == 0  tic-flags.bufpos == 0 
+	tic-nums.bufpos == 0  tic-strs.bufpos == 0 
+	tic-extras.bufpos == 0)
+		*cap++ = 0; /* alias */
+	else
+		*cap++ = 2; /* version */
 	le16enc(cap, len);
 	cap += sizeof(uint16_t);
 	memcpy(cap, tic-name, len);

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 00:01:27 UTC 2010

Modified Files:
src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c if_ex_cardbus.c
if_re_cardbus.c if_rtk_cardbus.c if_tlp_cardbus.c

Log Message:
sc_csr is read  written from the PCI Command  Status Register,
so make its type pcireg_t.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/cardbus/ahc_cardbus.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/cardbus/if_re_cardbus.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/cardbus/if_tlp_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 00:01:27 UTC 2010

Modified Files:
src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c if_ex_cardbus.c
if_re_cardbus.c if_rtk_cardbus.c if_tlp_cardbus.c

Log Message:
sc_csr is read  written from the PCI Command  Status Register,
so make its type pcireg_t.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/cardbus/ahc_cardbus.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/cardbus/if_re_cardbus.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/cardbus/if_tlp_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/cardbus/adv_cardbus.c
diff -u src/sys/dev/cardbus/adv_cardbus.c:1.24 src/sys/dev/cardbus/adv_cardbus.c:1.25
--- src/sys/dev/cardbus/adv_cardbus.c:1.24	Thu Feb 25 23:40:39 2010
+++ src/sys/dev/cardbus/adv_cardbus.c	Fri Feb 26 00:01:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: adv_cardbus.c,v 1.24 2010/02/25 23:40:39 dyoung Exp $	*/
+/*	$NetBSD: adv_cardbus.c,v 1.25 2010/02/26 00:01:27 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: adv_cardbus.c,v 1.24 2010/02/25 23:40:39 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: adv_cardbus.c,v 1.25 2010/02/26 00:01:27 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -77,7 +77,7 @@
 	pcitag_t sc_tag;
 
 	int	sc_bar;
-	int	sc_csr;			/* CSR bits */
+	pcireg_t	sc_csr;
 	bus_size_t sc_size;
 };
 

Index: src/sys/dev/cardbus/ahc_cardbus.c
diff -u src/sys/dev/cardbus/ahc_cardbus.c:1.31 src/sys/dev/cardbus/ahc_cardbus.c:1.32
--- src/sys/dev/cardbus/ahc_cardbus.c:1.31	Thu Feb 25 23:40:39 2010
+++ src/sys/dev/cardbus/ahc_cardbus.c	Fri Feb 26 00:01:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahc_cardbus.c,v 1.31 2010/02/25 23:40:39 dyoung Exp $	*/
+/*	$NetBSD: ahc_cardbus.c,v 1.32 2010/02/26 00:01:27 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahc_cardbus.c,v 1.31 2010/02/25 23:40:39 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahc_cardbus.c,v 1.32 2010/02/26 00:01:27 dyoung Exp $);
 
 #include opt_ahc_cardbus.h
 
@@ -80,7 +80,7 @@
 	pcitag_t sc_tag;
 
 	int	sc_bar;
-	int	sc_csr;			/* CSR bits */
+	pcireg_t	sc_csr;
 	bus_size_t sc_size;
 };
 

Index: src/sys/dev/cardbus/if_ex_cardbus.c
diff -u src/sys/dev/cardbus/if_ex_cardbus.c:1.48 src/sys/dev/cardbus/if_ex_cardbus.c:1.49
--- src/sys/dev/cardbus/if_ex_cardbus.c:1.48	Thu Feb 25 23:40:39 2010
+++ src/sys/dev/cardbus/if_ex_cardbus.c	Fri Feb 26 00:01:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ex_cardbus.c,v 1.48 2010/02/25 23:40:39 dyoung Exp $	*/
+/*	$NetBSD: if_ex_cardbus.c,v 1.49 2010/02/26 00:01:27 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1998 and 1999
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ex_cardbus.c,v 1.48 2010/02/25 23:40:39 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ex_cardbus.c,v 1.49 2010/02/26 00:01:27 dyoung Exp $);
 
 /* #define EX_DEBUG 4 */	/* define to report information for debugging */
 
@@ -106,7 +106,7 @@
 
 	pcitag_t sc_tag;
 
-	int	sc_csr;			/* CSR bits */
+	pcireg_t	sc_csr;
 	int	sc_bar_reg;		/* which BAR to use */
 	pcireg_t sc_bar_val;		/* value of the BAR */
 	int	sc_bar_reg1;		/* which BAR to use */

Index: src/sys/dev/cardbus/if_re_cardbus.c
diff -u src/sys/dev/cardbus/if_re_cardbus.c:1.22 src/sys/dev/cardbus/if_re_cardbus.c:1.23
--- src/sys/dev/cardbus/if_re_cardbus.c:1.22	Thu Feb 25 23:40:39 2010
+++ src/sys/dev/cardbus/if_re_cardbus.c	Fri Feb 26 00:01:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_re_cardbus.c,v 1.22 2010/02/25 23:40:39 dyoung Exp $	*/
+/*	$NetBSD: if_re_cardbus.c,v 1.23 2010/02/26 00:01:27 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2004 Jonathan Stone
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_re_cardbus.c,v 1.22 2010/02/25 23:40:39 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_re_cardbus.c,v 1.23 2010/02/26 00:01:27 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -92,7 +92,7 @@
 	void *sc_ih;
 	cardbus_devfunc_t sc_ct;
 	pcitag_t sc_tag;
-	int sc_csr;
+	pcireg_t sc_csr;
 	int sc_bar_reg;
 	pcireg_t sc_bar_val;
 	bus_size_t sc_mapsize;

Index: src/sys/dev/cardbus/if_rtk_cardbus.c
diff -u src/sys/dev/cardbus/if_rtk_cardbus.c:1.41 src/sys/dev/cardbus/if_rtk_cardbus.c:1.42
--- src/sys/dev/cardbus/if_rtk_cardbus.c:1.41	Thu Feb 25 23:40:39 2010
+++ src/sys/dev/cardbus/if_rtk_cardbus.c	Fri Feb 26 00:01:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_rtk_cardbus.c,v 1.41 2010/02/25 23:40:39 dyoung Exp $	*/
+/*	$NetBSD: if_rtk_cardbus.c,v 1.42 2010/02/26 00:01:27 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000 Masanori Kanaoka
@@

CVS commit: src/lib/libterminfo

2010-02-25 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Fri Feb 26 00:09:00 UTC 2010

Modified Files:
src/lib/libterminfo: term.c term.h termcap.c terminfo.5.in

Log Message:
Implement captoinfo so that we can convert $TERMCAP into $TERMINFO.
We don't currently map % %B %D.
That means no conversion for regent100, hz1500, act4, act5, mime terms.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libterminfo/term.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libterminfo/term.h
cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/termcap.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libterminfo/terminfo.5.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libterminfo/term.c
diff -u src/lib/libterminfo/term.c:1.10 src/lib/libterminfo/term.c:1.11
--- src/lib/libterminfo/term.c:1.10	Mon Feb 22 23:05:39 2010
+++ src/lib/libterminfo/term.c	Fri Feb 26 00:09:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.10 2010/02/22 23:05:39 roy Exp $ */
+/* $NetBSD: term.c,v 1.11 2010/02/26 00:09:00 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: term.c,v 1.10 2010/02/22 23:05:39 roy Exp $);
+__RCSID($NetBSD: term.c,v 1.11 2010/02/26 00:09:00 roy Exp $);
 
 #include sys/stat.h
 
@@ -283,6 +283,34 @@
 }
 
 static int
+ticcmp(const TIC *tic, const char *name)
+{
+	char *alias, *s;
+	size_t len, l;
+
+	if (strcmp(tic-name, name) == 0)
+		return 0;
+	if (tic-alias == NULL)
+		return -1;
+
+	len = strlen(name);
+	alias = tic-alias;
+	while (*alias != '\0') {
+		s = strchr(alias, '|');
+		if (s == NULL)
+			l = strlen(alias);
+		else
+			l = s - alias;
+		if (len == l  strncmp(alias, name, l) == 0)
+			return 0;
+		if (s == NULL)
+			break;
+		alias = s + 1;
+	}
+	return 1;
+}
+
+static int
 _ti_findterm(TERMINAL *term, const char *name, int flags)
 {
 	int r;
@@ -298,13 +326,32 @@
 	_ti_database = NULL;
 	r = 0;
 
-	if ((e = getenv(TERMINFO)) != NULL  *e != '\0') {
+	if ((e = getenv(TERMINFO)) != NULL  *e != '\0')
 		if (e[0] == '/')
 			return _ti_dbgetterm(term, e, name, flags);
-		c = strdup(e); /* So we don't destroy env */
-		tic = _ti_compile(c, TIC_WARNING | TIC_EXTRA);
-		free(c);
-		if (tic != NULL  strcmp(tic-name, name) == 0) {
+
+	c = NULL;
+	if (e == NULL  (c = getenv(TERMCAP)) != NULL) {
+		if (*c != '\0'  *c != '/') {
+			c = strdup(c);
+			if (c != NULL) {
+e = captoinfo(c);
+free(c);
+			}
+		}
+	}
+
+	if (e != NULL) {
+		if (c == NULL)
+			e = strdup(e); /* So we don't destroy env */
+		if (e  == NULL)
+			tic = NULL;
+		else
+			tic = _ti_compile(e, TIC_WARNING |
+			TIC_ALIAS | TIC_DESCRIPTION | TIC_EXTRA);
+		if (c == NULL  e != NULL)
+			free(e);
+		if (tic != NULL  ticcmp(tic, name) == 0) {
 			len = _ti_flatten(f, tic);
 			if (len != -1) {
 r = _ti_readterm(term, (char *)f, len, flags);
@@ -313,7 +360,10 @@
 		}
 		_ti_freetic(tic);
 		if (r == 1) {
-			_ti_database = $TERMINFO;
+			if (c == NULL)
+_ti_database = $TERMINFO;
+			else
+_ti_database = $TERMCAP;
 			return r;
 		}
 	}

Index: src/lib/libterminfo/term.h
diff -u src/lib/libterminfo/term.h:1.4 src/lib/libterminfo/term.h:1.5
--- src/lib/libterminfo/term.h:1.4	Thu Feb 11 00:27:09 2010
+++ src/lib/libterminfo/term.h	Fri Feb 26 00:09:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.4 2010/02/11 00:27:09 roy Exp $ */
+/* $NetBSD: term.h,v 1.5 2010/02/26 00:09:00 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -1512,5 +1512,9 @@
 #  define t_parm t_vtparm
 #endif
 
+/* Convert a termcap string into a terminfo string.
+ * The passed string is destroyed and the return string needs to be freed. */
+char *		captoinfo(char *);
+
 __END_DECLS
 #endif

Index: src/lib/libterminfo/termcap.c
diff -u src/lib/libterminfo/termcap.c:1.2 src/lib/libterminfo/termcap.c:1.3
--- src/lib/libterminfo/termcap.c:1.2	Thu Feb  4 09:46:26 2010
+++ src/lib/libterminfo/termcap.c	Fri Feb 26 00:09:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: termcap.c,v 1.2 2010/02/04 09:46:26 roy Exp $ */
+/* $NetBSD: termcap.c,v 1.3 2010/02/26 00:09:00 roy Exp $ */
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,9 +28,11 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: termcap.c,v 1.2 2010/02/04 09:46:26 roy Exp $);
+__RCSID($NetBSD: termcap.c,v 1.3 2010/02/26 00:09:00 roy Exp $);
 
 #include assert.h
+#include ctype.h
+#include errno.h
 #include stdint.h
 #include string.h
 #include term_private.h
@@ -180,3 +182,176 @@
 	_DIAGASSERT(cm != NULL);
 	return vtparm(cm, destline, destcol);
 }
+
+static const char *
+flagname(const char *key)
+{
+	uint32_t idx;
+
+	idx = _t_flaghash((const unsigned char *)key, strlen(key));
+	if (idx = __arraycount(_ti_cap_flagids) 
+	strcmp(key, _ti_cap_flagids[idx].id) == 0)
+		return _ti_flagid(_ti_cap_flagids[idx].ti);
+	return key;
+}
+
+static const char *
+numname(const char *key)
+{
+	uint32_t idx;
+
+	idx =

CVS commit: src/lib/libterminfo

2010-02-25 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Fri Feb 26 00:09:00 UTC 2010

Modified Files:
src/lib/libterminfo: term.c term.h termcap.c terminfo.5.in

Log Message:
Implement captoinfo so that we can convert $TERMCAP into $TERMINFO.
We don't currently map % %B %D.
That means no conversion for regent100, hz1500, act4, act5, mime terms.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libterminfo/term.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libterminfo/term.h
cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/termcap.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libterminfo/terminfo.5.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/pci

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 00:38:14 UTC 2010

Modified Files:
src/sys/dev/pci: if_ex_pci.c pcireg.h

Log Message:
Move the definitions for PCI_BAR0, PCI_BAR1, PCI_BAR2, PCI_BAR3,
PCI_BAR4, and PCI_BAR5 to pcireg.h for re-use.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/if_ex_pci.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/pcireg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/pci

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 00:38:14 UTC 2010

Modified Files:
src/sys/dev/pci: if_ex_pci.c pcireg.h

Log Message:
Move the definitions for PCI_BAR0, PCI_BAR1, PCI_BAR2, PCI_BAR3,
PCI_BAR4, and PCI_BAR5 to pcireg.h for re-use.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/if_ex_pci.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/pcireg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_ex_pci.c
diff -u src/sys/dev/pci/if_ex_pci.c:1.50 src/sys/dev/pci/if_ex_pci.c:1.51
--- src/sys/dev/pci/if_ex_pci.c:1.50	Tue May  5 10:02:52 2009
+++ src/sys/dev/pci/if_ex_pci.c	Fri Feb 26 00:38:14 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ex_pci.c,v 1.50 2009/05/05 10:02:52 cegger Exp $	*/
+/*	$NetBSD: if_ex_pci.c,v 1.51 2010/02/26 00:38:14 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ex_pci.c,v 1.50 2009/05/05 10:02:52 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ex_pci.c,v 1.51 2010/02/26 00:38:14 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -326,12 +326,6 @@
 {
 
 #define PCI_CACHE_LAT_BIST	0x0c
-#define PCI_BAR0		0x10
-#define PCI_BAR1		0x14
-#define PCI_BAR2		0x18
-#define PCI_BAR3		0x1C
-#define PCI_BAR4		0x20
-#define PCI_BAR5		0x24
 #define PCI_EXP_ROM_BAR		0x30
 #define PCI_INT_GNT_LAT		0x3c
 

Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.65 src/sys/dev/pci/pcireg.h:1.66
--- src/sys/dev/pci/pcireg.h:1.65	Tue Feb 23 19:28:00 2010
+++ src/sys/dev/pci/pcireg.h	Fri Feb 26 00:38:14 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcireg.h,v 1.65 2010/02/23 19:28:00 dyoung Exp $	*/
+/*	$NetBSD: pcireg.h,v 1.66 2010/02/26 00:38:14 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -358,6 +358,13 @@
 #define	PCI_MAPREG_PPB_END		0x18
 #define	PCI_MAPREG_PCB_END		0x14
 
+#define PCI_BAR0		0x10
+#define PCI_BAR1		0x14
+#define PCI_BAR2		0x18
+#define PCI_BAR3		0x1C
+#define PCI_BAR4		0x20
+#define PCI_BAR5		0x24
+
 #define	PCI_MAPREG_TYPE(mr)		\
 	((mr)  PCI_MAPREG_TYPE_MASK)
 #define	PCI_MAPREG_TYPE_MASK			0x0001

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 00:57:02 UTC 2010

Modified Files:
src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c cardbus.c
cardbus_map.c cardbusreg.h com_cardbus.c ehci_cardbus.c
fwohci_cardbus.c if_ex_cardbus.c if_fxp_cardbus.c if_ral_cardbus.c
if_re_cardbus.c if_rtk_cardbus.c if_tlp_cardbus.c njata_cardbus.c
njs_cardbus.c ohci_cardbus.c rbus_ppb.c siisata_cardbus.c
uhci_cardbus.c

Log Message:
Use PCI_ constants and macros instead of CARDBUS_.  Use
Cardbus_conf_{read,write}() instead of cardbus_conf_{read,write}().
Delete all of the CARDBUS_ constants and macros that replicate PCI_.

Compile-tested, only.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/cardbus/ahc_cardbus.c
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/cardbus_map.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/cardbus/cardbusreg.h
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/cardbus/fwohci_cardbus.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/cardbus/if_ral_cardbus.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/cardbus/if_re_cardbus.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/cardbus/if_tlp_cardbus.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/cardbus/njata_cardbus.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cardbus/njs_cardbus.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/cardbus/ohci_cardbus.c \
src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/cardbus/siisata_cardbus.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/cardbus/uhci_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 01:12:56 UTC 2010

Modified Files:
src/sys/dev/cardbus: cardbus.c cardbusvar.h if_rtw_cardbus.c

Log Message:
Introduce Cardbus_intr_establish(cardbus_devfunc_t, ...) and
Cardbus_intr_disestablish(cardbus_devfunc_t, ...) and start using them.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/cardbus/cardbusvar.h
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/cardbus/if_rtw_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/cardbus/cardbus.c
diff -u src/sys/dev/cardbus/cardbus.c:1.105 src/sys/dev/cardbus/cardbus.c:1.106
--- src/sys/dev/cardbus/cardbus.c:1.105	Fri Feb 26 00:57:01 2010
+++ src/sys/dev/cardbus/cardbus.c	Fri Feb 26 01:12:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cardbus.c,v 1.105 2010/02/26 00:57:01 dyoung Exp $	*/
+/*	$NetBSD: cardbus.c,v 1.106 2010/02/26 01:12:56 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999 and 2000
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cardbus.c,v 1.105 2010/02/26 00:57:01 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: cardbus.c,v 1.106 2010/02/26 01:12:56 dyoung Exp $);
 
 #include opt_cardbus.h
 
@@ -710,6 +710,14 @@
 	free(ct, M_DEVBUF);
 }
 
+void *
+Cardbus_intr_establish(cardbus_devfunc_t ct,
+cardbus_intr_line_t irq, int level, int (*func)(void *), void *arg)
+{
+	return cardbus_intr_establish(ct-ct_cc, ct-ct_cf, irq, level, func,
+	arg);
+}
+
 /*
  * void *cardbus_intr_establish(cc, cf, irq, level, func, arg)
  *   Interrupt handler of pccard.
@@ -726,6 +734,12 @@
 	return ((*cf-cardbus_intr_establish)(cc, irq, level, func, arg));
 }
 
+void
+Cardbus_intr_disestablish(cardbus_devfunc_t ct, void *handler)
+{
+	cardbus_intr_disestablish(ct-ct_cc, ct-ct_cf, handler);
+}
+
 /*
  * void cardbus_intr_disestablish(cc, cf, handler)
  *   Interrupt handler of pccard.

Index: src/sys/dev/cardbus/cardbusvar.h
diff -u src/sys/dev/cardbus/cardbusvar.h:1.47 src/sys/dev/cardbus/cardbusvar.h:1.48
--- src/sys/dev/cardbus/cardbusvar.h:1.47	Thu Feb 25 00:47:39 2010
+++ src/sys/dev/cardbus/cardbusvar.h	Fri Feb 26 01:12:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cardbusvar.h,v 1.47 2010/02/25 00:47:39 dyoung Exp $	*/
+/*	$NetBSD: cardbusvar.h,v 1.48 2010/02/26 01:12:56 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -303,6 +303,10 @@
 
 int cardbus_attach_card(struct cardbus_softc *);
 void cardbus_detach_card(struct cardbus_softc *);
+void *
+Cardbus_intr_establish(cardbus_devfunc_t,
+cardbus_intr_line_t, int, int (*)(void *), void *);
+void Cardbus_intr_disestablish(cardbus_devfunc_t, void *);
 void *cardbus_intr_establish(cardbus_chipset_tag_t, cardbus_function_tag_t,
 cardbus_intr_line_t, int, int (*) (void *), void *arg);
 void cardbus_intr_disestablish(cardbus_chipset_tag_t,

Index: src/sys/dev/cardbus/if_rtw_cardbus.c
diff -u src/sys/dev/cardbus/if_rtw_cardbus.c:1.37 src/sys/dev/cardbus/if_rtw_cardbus.c:1.38
--- src/sys/dev/cardbus/if_rtw_cardbus.c:1.37	Thu Feb 25 23:01:48 2010
+++ src/sys/dev/cardbus/if_rtw_cardbus.c	Fri Feb 26 01:12:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.37 2010/02/25 23:01:48 dyoung Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.38 2010/02/26 01:12:56 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
@@ -64,7 +64,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_rtw_cardbus.c,v 1.37 2010/02/25 23:01:48 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_rtw_cardbus.c,v 1.38 2010/02/26 01:12:56 dyoung Exp $);
 
 #include opt_inet.h
 
@@ -321,7 +321,7 @@
 	 * Unhook the interrupt handler.
 	 */
 	if (csc-sc_ih != NULL)
-		cardbus_intr_disestablish(ct-ct_cc, ct-ct_cf, csc-sc_ih);
+		Cardbus_intr_disestablish(ct, csc-sc_ih);
 
 	/*
 	 * Release bus space and close window.
@@ -339,13 +339,11 @@
 	struct rtw_cardbus_softc *csc = device_private(self);
 	struct rtw_softc *sc = csc-sc_rtw;
 	cardbus_devfunc_t ct = csc-sc_ct;
-	cardbus_chipset_tag_t cc = ct-ct_cc;
-	cardbus_function_tag_t cf = ct-ct_cf;
 
 	/*
 	 * Map and establish the interrupt.
 	 */
-	csc-sc_ih = cardbus_intr_establish(cc, cf, csc-sc_intrline, IPL_NET,
+	csc-sc_ih = Cardbus_intr_establish(ct, csc-sc_intrline, IPL_NET,
 	rtw_intr, sc);
 	if (csc-sc_ih == NULL) {
 		aprint_error_dev(sc-sc_dev,
@@ -367,8 +365,6 @@
 	struct rtw_cardbus_softc *csc = device_private(self);
 	struct rtw_softc *sc = csc-sc_rtw;
 	cardbus_devfunc_t ct = csc-sc_ct;
-	cardbus_chipset_tag_t cc = ct-ct_cc;
-	cardbus_function_tag_t cf = ct-ct_cf;
 
 	if (!rtw_suspend(self, qual))
 		return false;
@@ -379,7 +375,7 @@
 	rtw_cardbus_funcregen(sc-sc_regs, 0);
 
 	/* Unhook the interrupt handler. */
-	cardbus_intr_disestablish(cc, cf, csc-sc_ih);
+	Cardbus_intr_disestablish(ct, csc-sc_ih);
 	csc-sc_ih = NULL;
 	return true;
 }

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 01:12:56 UTC 2010

Modified Files:
src/sys/dev/cardbus: cardbus.c cardbusvar.h if_rtw_cardbus.c

Log Message:
Introduce Cardbus_intr_establish(cardbus_devfunc_t, ...) and
Cardbus_intr_disestablish(cardbus_devfunc_t, ...) and start using them.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/cardbus/cardbusvar.h
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/cardbus/if_rtw_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 01:15:08 UTC 2010

Modified Files:
src/sys/dev/cardbus: cardbusvar.h

Log Message:
Cosmetic: join a line.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/cardbus/cardbusvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 01:15:08 UTC 2010

Modified Files:
src/sys/dev/cardbus: cardbusvar.h

Log Message:
Cosmetic: join a line.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/cardbus/cardbusvar.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/cardbus/cardbusvar.h
diff -u src/sys/dev/cardbus/cardbusvar.h:1.48 src/sys/dev/cardbus/cardbusvar.h:1.49
--- src/sys/dev/cardbus/cardbusvar.h:1.48	Fri Feb 26 01:12:56 2010
+++ src/sys/dev/cardbus/cardbusvar.h	Fri Feb 26 01:15:08 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cardbusvar.h,v 1.48 2010/02/26 01:12:56 dyoung Exp $	*/
+/*	$NetBSD: cardbusvar.h,v 1.49 2010/02/26 01:15:08 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -303,8 +303,7 @@
 
 int cardbus_attach_card(struct cardbus_softc *);
 void cardbus_detach_card(struct cardbus_softc *);
-void *
-Cardbus_intr_establish(cardbus_devfunc_t,
+void *Cardbus_intr_establish(cardbus_devfunc_t,
 cardbus_intr_line_t, int, int (*)(void *), void *);
 void Cardbus_intr_disestablish(cardbus_devfunc_t, void *);
 void *cardbus_intr_establish(cardbus_chipset_tag_t, cardbus_function_tag_t,

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 01:16:09 UTC 2010

Modified Files:
src/sys/dev/cardbus: cardbusvar.h

Log Message:
Cosmetic: re-wrap some line.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/cardbus/cardbusvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/cardbus

2010-02-25 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Feb 26 01:16:09 UTC 2010

Modified Files:
src/sys/dev/cardbus: cardbusvar.h

Log Message:
Cosmetic: re-wrap some line.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/cardbus/cardbusvar.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/cardbus/cardbusvar.h
diff -u src/sys/dev/cardbus/cardbusvar.h:1.49 src/sys/dev/cardbus/cardbusvar.h:1.50
--- src/sys/dev/cardbus/cardbusvar.h:1.49	Fri Feb 26 01:15:08 2010
+++ src/sys/dev/cardbus/cardbusvar.h	Fri Feb 26 01:16:09 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cardbusvar.h,v 1.49 2010/02/26 01:15:08 dyoung Exp $	*/
+/*	$NetBSD: cardbusvar.h,v 1.50 2010/02/26 01:16:09 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -308,8 +308,8 @@
 void Cardbus_intr_disestablish(cardbus_devfunc_t, void *);
 void *cardbus_intr_establish(cardbus_chipset_tag_t, cardbus_function_tag_t,
 cardbus_intr_line_t, int, int (*) (void *), void *arg);
-void cardbus_intr_disestablish(cardbus_chipset_tag_t,
-cardbus_function_tag_t, void *);
+void cardbus_intr_disestablish(cardbus_chipset_tag_t, cardbus_function_tag_t,
+void *);
 
 int cardbus_mapreg_map(struct cardbus_softc *, int, int, pcireg_t,
 int, bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *, bus_size_t *);

CVS commit: src/sbin/dump

2010-02-25 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 26 02:11:40 UTC 2010

Modified Files:
src/sbin/dump: dump.8 dump.h itime.c main.c

Log Message:
PR/42883: Greywolf: Add -i flag which brings true incremental capability.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sbin/dump/dump.8
cvs rdiff -u -r1.45 -r1.46 src/sbin/dump/dump.h
cvs rdiff -u -r1.16 -r1.17 src/sbin/dump/itime.c
cvs rdiff -u -r1.64 -r1.65 src/sbin/dump/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/dump/dump.8
diff -u src/sbin/dump/dump.8:1.58 src/sbin/dump/dump.8:1.59
--- src/sbin/dump/dump.8:1.58	Fri Jan 30 06:55:04 2009
+++ src/sbin/dump/dump.8	Thu Feb 25 21:11:40 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: dump.8,v 1.58 2009/01/30 11:55:04 enami Exp $
+.\	$NetBSD: dump.8,v 1.59 2010/02/26 02:11:40 christos Exp $
 .\
 .\ Copyright (c) 1980, 1991, 1993
 .\	 Regents of the University of California.
@@ -30,7 +30,7 @@
 .\
 .\ @(#)dump.8	8.3 (Berkeley) 5/1/95
 .\
-.Dd August 12, 2008
+.Dd February 25, 2010
 .Dt DUMP 8
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nd file system backup
 .Sh SYNOPSIS
 .Nm
-.Op Fl 0123456789aceFnStuX
+.Op Fl 0123456789aceFinStuX
 .Bk -words
 .Op Fl B Ar records
 .Ek
@@ -147,7 +147,9 @@
 option below).
 A level number above 0, incremental backup,
 tells dump to copy all files new or modified since the
-last dump of a lower level.
+last dump of a lower level (but see also the
+.Fl i
+option below).
 The default level is 9.
 .It Fl a
 .Dq auto-size .
@@ -221,6 +223,10 @@
 The default honor level is 1,
 so that incremental backups omit such files
 but full backups retain them.
+.It Fl i Ar incremental
+The dump is treated as level 9 but takes into account a previous
+level 9, if one exists.  This makes it possible to perform a true
+incremental dump.
 .It Fl k Ar read-blocksize
 The size in kilobyte of the read buffers, rounded up to a multiple of the
 file system block size.
@@ -551,6 +557,12 @@
 .Nm
 command appeared in
 .At v6 .
+.Pp
+The
+.Fl i
+flag was inspired by the
+.Fl x
+flag from Sun's Solstice Backup utility.
 .Sh BUGS
 Fewer than 32 read errors on the file system are ignored.
 .Pp

Index: src/sbin/dump/dump.h
diff -u src/sbin/dump/dump.h:1.45 src/sbin/dump/dump.h:1.46
--- src/sbin/dump/dump.h:1.45	Sat Feb 16 12:58:01 2008
+++ src/sbin/dump/dump.h	Thu Feb 25 21:11:40 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: dump.h,v 1.45 2008/02/16 17:58:01 matt Exp $	*/
+/*	$NetBSD: dump.h,v 1.46 2010/02/26 02:11:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -110,6 +110,7 @@
 int	diskfd;		/* disk file descriptor */
 int	tapefd;		/* tape file descriptor */
 int	pipeout;	/* true = output to standard output */
+int	trueinc;	/* true = true incremental, i.e use last 9 as ref */
 ino_t	curino;		/* current inumber; used globally */
 int	newtape;	/* new tape flag */
 u_int64_t	tapesize;	/* estimated tape size, blocks */

Index: src/sbin/dump/itime.c
diff -u src/sbin/dump/itime.c:1.16 src/sbin/dump/itime.c:1.17
--- src/sbin/dump/itime.c:1.16	Fri May 19 10:52:39 2006
+++ src/sbin/dump/itime.c	Thu Feb 25 21:11:40 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: itime.c,v 1.16 2006/05/19 14:52:39 christos Exp $	*/
+/*	$NetBSD: itime.c,v 1.17 2010/02/26 02:11:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = @(#)itime.c	8.1 (Berkeley) 6/5/93;
 #else
-__RCSID($NetBSD: itime.c,v 1.16 2006/05/19 14:52:39 christos Exp $);
+__RCSID($NetBSD: itime.c,v 1.17 2010/02/26 02:11:40 christos Exp $);
 #endif
 #endif /* not lint */
 
@@ -145,12 +145,14 @@
 	initdumptimes();
 	/*
 	 *	Go find the entry with the same name for a lower increment
-	 *	and older date
+	 *	and older date.  If we are doing a true incremental, then
+	 *	we can use level 9 as a ref point
 	 */
 	ITITERATE(i, ddp) {
 		if (strncmp(fname, ddp-dd_name, sizeof (ddp-dd_name)) != 0)
 			continue;
-		if (ddp-dd_level = level)
+		if ((!trueinc  (ddp-dd_level = level)) ||
+		(trueinc  (ddp-dd_level  level)))
 			continue;
 		if (ddp-dd_ddate = iswap32(spcl.c_ddate))
 			continue;

Index: src/sbin/dump/main.c
diff -u src/sbin/dump/main.c:1.64 src/sbin/dump/main.c:1.65
--- src/sbin/dump/main.c:1.64	Sat Jul 19 21:20:22 2008
+++ src/sbin/dump/main.c	Thu Feb 25 21:11:40 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.64 2008/07/20 01:20:22 lukem Exp $	*/
+/*	$NetBSD: main.c,v 1.65 2010/02/26 02:11:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = @(#)main.c	8.6 (Berkeley) 5/1/95;
 #else
-__RCSID($NetBSD: main.c,v 1.64 2008/07/20 01:20:22 lukem Exp $);
+__RCSID($NetBSD: main.c,v 1.65 2010/02/26 02:11:40 christos Exp $);
 #endif
 #endif /* not lint */
 
@@ -134,7 +134,7 @@
 
 	obsolete(argc, argv);
 	while ((ch = getopt(argc, argv,
-	0123456789aB:b:cd:eFf:h:k:l:L:nr:s:StT:uWwx:X)) != -1)
+

CVS commit: src/sbin/dump

2010-02-25 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 26 02:11:40 UTC 2010

Modified Files:
src/sbin/dump: dump.8 dump.h itime.c main.c

Log Message:
PR/42883: Greywolf: Add -i flag which brings true incremental capability.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sbin/dump/dump.8
cvs rdiff -u -r1.45 -r1.46 src/sbin/dump/dump.h
cvs rdiff -u -r1.16 -r1.17 src/sbin/dump/itime.c
cvs rdiff -u -r1.64 -r1.65 src/sbin/dump/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/tre/libtre

2010-02-25 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Fri Feb 26 05:23:18 UTC 2010

Added Files:
src/external/bsd/tre/libtre: shlib_version

Log Message:
add reachover shlib version file


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/tre/libtre/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/tre/libtre

2010-02-25 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Fri Feb 26 05:23:18 UTC 2010

Added Files:
src/external/bsd/tre/libtre: shlib_version

Log Message:
add reachover shlib version file


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/tre/libtre/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/tre/libtre/shlib_version
diff -u /dev/null src/external/bsd/tre/libtre/shlib_version:1.1
--- /dev/null	Fri Feb 26 05:23:18 2010
+++ src/external/bsd/tre/libtre/shlib_version	Fri Feb 26 05:23:18 2010
@@ -0,0 +1,2 @@
+major=0
+minor=8

CVS commit: src/sbin/dump

2010-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Fri Feb 26 07:01:17 UTC 2010

Modified Files:
src/sbin/dump: dump.8

Log Message:
-i does not take an argument. Remove unnecessary Bk/Ek. New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sbin/dump/dump.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sbin/dump

2010-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Fri Feb 26 07:01:17 UTC 2010

Modified Files:
src/sbin/dump: dump.8

Log Message:
-i does not take an argument. Remove unnecessary Bk/Ek. New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sbin/dump/dump.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/dump/dump.8
diff -u src/sbin/dump/dump.8:1.59 src/sbin/dump/dump.8:1.60
--- src/sbin/dump/dump.8:1.59	Fri Feb 26 02:11:40 2010
+++ src/sbin/dump/dump.8	Fri Feb 26 07:01:17 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: dump.8,v 1.59 2010/02/26 02:11:40 christos Exp $
+.\	$NetBSD: dump.8,v 1.60 2010/02/26 07:01:17 wiz Exp $
 .\
 .\ Copyright (c) 1980, 1991, 1993
 .\	 Regents of the University of California.
@@ -40,42 +40,18 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl 0123456789aceFinStuX
-.Bk -words
 .Op Fl B Ar records
-.Ek
-.Bk -words
 .Op Fl b Ar blocksize
-.Ek
-.Bk -words
 .Op Fl d Ar density
-.Ek
-.Bk -words
 .Op Fl f Ar file
-.Ek
-.Bk -words
 .Op Fl h Ar level
-.Ek
-.Bk -words
 .Op Fl k Ar read-blocksize
-.Ek
-.Bk -words
 .Op Fl L Ar label
-.Ek
-.Bk -words
 .Op Fl l Ar timeout
-.Ek
-.Bk -words
 .Op Fl r Ar cachesize
-.Ek
-.Bk -words
 .Op Fl s Ar feet
-.Ek
-.Bk -words
 .Op Fl T Ar date
-.Ek
-.Bk -words
 .Op Fl x Ar snap-backup
-.Ek
 .Ar files-to-dump
 .Nm
 .Op Fl W Li \| Fl w
@@ -223,10 +199,12 @@
 The default honor level is 1,
 so that incremental backups omit such files
 but full backups retain them.
-.It Fl i Ar incremental
+.It Fl i
 The dump is treated as level 9 but takes into account a previous
-level 9, if one exists.  This makes it possible to perform a true
-incremental dump.
+level 9, if one exists.
+This makes it possible to perform a
+.Dq true incremental
+dump.
 .It Fl k Ar read-blocksize
 The size in kilobyte of the read buffers, rounded up to a multiple of the
 file system block size.

CVS commit: src/lib/libterminfo

2010-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Fri Feb 26 07:03:49 UTC 2010

Modified Files:
src/lib/libterminfo: terminfo.5.in

Log Message:
'' replacement for HTML output, be explicit about slash.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libterminfo/terminfo.5.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libterminfo/terminfo.5.in
diff -u src/lib/libterminfo/terminfo.5.in:1.13 src/lib/libterminfo/terminfo.5.in:1.14
--- src/lib/libterminfo/terminfo.5.in:1.13	Fri Feb 26 00:09:00 2010
+++ src/lib/libterminfo/terminfo.5.in	Fri Feb 26 07:03:49 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: terminfo.5.in,v 1.13 2010/02/26 00:09:00 roy Exp $
+.\	$NetBSD: terminfo.5.in,v 1.14 2010/02/26 07:03:49 wiz Exp $
 .\
 .\ Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -203,14 +203,17 @@
 .Pp
 If the environment variable
 .Ev TERMINFO
-is available, does not begin with /, can be compiled with the above rules and
-whose name matches
+is available, does not begin with
+.Pq Sq / ,
+can be compiled with the above rules and whose name matches
 .Ev TERM
 then it is used.
 .Pp
 If the environment variable
 .Ev TERMCAP
-is available and does not begin with / then it will be translated into
+is available and does not begin with a slash
+.Pq Sq /
+then it will be translated into
 terminfo and compiled as above.
 If its name matches
 .Ev TERM
@@ -218,7 +221,9 @@
 .Pp
 If the environment variable
 .Ev TERMINFO
-is available and begins with / then only this file is searched.
+is available and begins with a slash
+.Pq Sq /
+then only this file is searched.
 Otherwise
 .Nm
 will first look for
@@ -259,4 +264,4 @@
 .Sh BUGS
 The
 .Ev TERMCAP
-capabilities %, %B and %D are not converted into terminfo capabilities.
+capabilities %\*[Gt], %B and %D are not converted into terminfo capabilities.

CVS commit: src/lib/libterminfo

2010-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Fri Feb 26 07:03:49 UTC 2010

Modified Files:
src/lib/libterminfo: terminfo.5.in

Log Message:
'' replacement for HTML output, be explicit about slash.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libterminfo/terminfo.5.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

79 matches

Mail list logo