CVS commit: [uebayasi-xip] src/sys/uvm

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Tue Feb  9 08:23:10 UTC 2010

Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c

Log Message:
Merge vm_physseg lookup routines.


To generate a diff of this commit:
cvs rdiff -u -r1.153.2.4 -r1.153.2.5 src/sys/uvm/uvm_page.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_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.4 src/sys/uvm/uvm_page.c:1.153.2.5
--- src/sys/uvm/uvm_page.c:1.153.2.4	Tue Feb  9 07:42:26 2010
+++ src/sys/uvm/uvm_page.c	Tue Feb  9 08:23:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.4 2010/02/09 07:42:26 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.5 2010/02/09 08:23:10 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.4 2010/02/09 07:42:26 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.5 2010/02/09 08:23:10 uebayasi Exp $);
 
 #include opt_ddb.h
 #include opt_uvmhist.h
@@ -872,24 +872,20 @@
 
 #if VM_PHYSSEG_MAX == 1
 #define	VM_PHYSSEG_FIND	vm_physseg_find_contig
-#define	VM_PHYSSEG_FIND_BY_PG	vm_physseg_find_by_pg_contig
 #elif (VM_PHYSSEG_STRAT == VM_PSTRAT_BSEARCH)
 #define	VM_PHYSSEG_FIND	vm_physseg_find_bsearch
-#define	VM_PHYSSEG_FIND_BY_PG	vm_physseg_find_by_pg_bsearch
 #else
 #define	VM_PHYSSEG_FIND	vm_physseg_find_linear
-#define	VM_PHYSSEG_FIND_BY_PG	vm_physseg_find_by_pg_linear
 #endif
 
 static inline int VM_PHYSSEG_FIND(struct vm_physseg *, int, int,
-paddr_t, struct vm_page *, int *);
-static inline struct vm_physseg *VM_PHYSSEG_FIND_BY_PG(const struct vm_page *);
+paddr_t, const struct vm_page *, int *);
 static inline bool vm_physseg_within_p(struct vm_physseg *, int, paddr_t,
-struct vm_page *);
+const struct vm_page *, int *);
 static inline bool vm_physseg_ge_p(struct vm_physseg *, int, paddr_t,
-struct vm_page *);
+const struct vm_page *, int *);
 static inline bool vm_physseg_lt_p(struct vm_physseg *, int, paddr_t,
-struct vm_page *);
+const struct vm_page *, int *);
 
 int
 vm_physseg_find(paddr_t pframe, int *offp)
@@ -902,13 +898,11 @@
 #if VM_PHYSSEG_MAX == 1
 static inline int
 vm_physseg_find_contig(struct vm_physseg *segs, int nsegs, int op,
-paddr_t pframe, struct vm_page *pg, int *offp)
+paddr_t pframe, const struct vm_page *pg, int *offp)
 {
 
 	/* 'contig' case */
-	if (vm_physseg_within_p(segs[0], op, pframe, pg)) {
-		if (offp)
-			*offp = pframe - segs[0].start;
+	if (vm_physseg_within_p(segs[0], op, pframe, pg, offp)) {
 		return(0);
 	}
 	return(-1);
@@ -918,7 +912,7 @@
 
 static inline int
 vm_physseg_find_bsearch(struct vm_physseg *segs, int nsegs, int op,
-paddr_t pframe, struct vm_page *pg, int *offp)
+paddr_t pframe, const struct vm_page *pg, int *offp)
 {
 	/* binary search for it */
 	u_int	start, len, try;
@@ -942,9 +936,7 @@
 		/* start past our try? */
 		if (vm_physseg_ge_p(segs[try], op, pframe, pg)) {
 			/* was try correct? */
-			if (vm_physseg_lt_p(segs[try], op, pframe, pg)) {
-if (offp)
-	*offp = pframe - segs[try].start;
+			if (vm_physseg_lt_p(segs[try], op, pframe, pg, offp)) {
 return(try);/* got it */
 			}
 			start = try + 1;	/* next time, start here */
@@ -963,15 +955,13 @@
 
 static inline int
 vm_physseg_find_linear(struct vm_physseg *segs, int nsegs, int op,
-paddr_t pframe, struct vm_page *pg, int *offp)
+paddr_t pframe, const struct vm_page *pg, int *offp)
 {
 	/* linear search for it */
 	int	lcv;
 
 	for (lcv = 0; lcv  nsegs; lcv++) {
-		if (vm_physseg_within_p(segs[lcv], op, pframe, pg)) {
-			if (offp)
-*offp = pframe - segs[lcv].start;
+		if (vm_physseg_within_p(segs[lcv], op, pframe, pg, offp)) {
 			return(lcv);		   /* got it */
 		}
 	}
@@ -981,22 +971,26 @@
 
 static inline bool
 vm_physseg_within_p(struct vm_physseg *seg, int op, paddr_t pframe,
-struct vm_page *pg)
+const struct vm_page *pg, int *offp)
 {
 
-	return vm_physseg_ge_p(seg, op, pframe, pg) 
-	vm_physseg_lt_p(seg, op, pframe, pg);
+	return vm_physseg_ge_p(seg, op, pframe, pg, offp) 
+	vm_physseg_lt_p(seg, op, pframe, pg, offp);
 }
 
 static inline bool
 vm_physseg_ge_p(struct vm_physseg *seg, int op, paddr_t pframe,
-struct vm_page *pg)
+const struct vm_page *pg, int *offp)
 {
 
 	switch (op) {
 	case VM_PHYSSEG_OP_PF:
+		if (offp)
+			*offp = pframe - seg-start;
 		return pframe = seg-start;
 	case VM_PHYSSEG_OP_PG:
+		if (offp)
+			*offp = pg - seg-pgs;
 		return pg = seg-pgs;
 	default:
 		return false;
@@ -1005,7 +999,7 @@
 
 static inline bool
 vm_physseg_lt_p(struct vm_physseg *seg, int op, paddr_t pframe,
-struct vm_page *pg)
+const struct vm_page *pg, int *offp)
 {
 
 	switch (op) {
@@ -1039,93 +1033,15 @@
 paddr_t
 uvm_vm_page_to_phys(const struct vm_page *pg)
 {
-	struct 

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Feb  9 08:31:34 UTC 2010

Modified Files:
src/share/man/man4: envsys.4

Log Message:
Bump date for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/share/man/man4/envsys.4

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

Modified files:

Index: src/share/man/man4/envsys.4
diff -u src/share/man/man4/envsys.4:1.46 src/share/man/man4/envsys.4:1.47
--- src/share/man/man4/envsys.4:1.46	Tue Feb  9 07:32:09 2010
+++ src/share/man/man4/envsys.4	Tue Feb  9 08:31:34 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: envsys.4,v 1.46 2010/02/09 07:32:09 cnst Exp $
+.\	$NetBSD: envsys.4,v 1.47 2010/02/09 08:31:34 wiz Exp $
 .\
 .\ Copyright (c) 2007 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd June 12, 2009
+.Dd February 9, 2010
 .Dt ENVSYS 4
 .Os
 .Sh NAME

CVS commit: [uebayasi-xip] src/sys/uvm

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Tue Feb  9 08:43:33 UTC 2010

Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c uvm_page.h uvm_pglist.c

Log Message:
vm_nphysseg - vm_nphysmem


To generate a diff of this commit:
cvs rdiff -u -r1.153.2.5 -r1.153.2.6 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.59.2.3 -r1.59.2.4 src/sys/uvm/uvm_page.h
cvs rdiff -u -r1.45 -r1.45.2.1 src/sys/uvm/uvm_pglist.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_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.5 src/sys/uvm/uvm_page.c:1.153.2.6
--- src/sys/uvm/uvm_page.c:1.153.2.5	Tue Feb  9 08:23:10 2010
+++ src/sys/uvm/uvm_page.c	Tue Feb  9 08:43:33 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.5 2010/02/09 08:23:10 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.6 2010/02/09 08:43:33 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.5 2010/02/09 08:23:10 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.6 2010/02/09 08:43:33 uebayasi Exp $);
 
 #include opt_ddb.h
 #include opt_uvmhist.h
@@ -100,7 +100,7 @@
  */
 
 struct vm_physseg vm_physmem[VM_PHYSSEG_MAX];	/* XXXCDC: uvm.physmem */
-int vm_nphysseg = 0;/* XXXCDC: uvm.nphysseg */
+int vm_nphysmem = 0;/* XXXCDC: uvm.nphysmem */
 
 /*
  * Some supported CPUs in a given architecture don't support all
@@ -372,7 +372,7 @@
 	 * now is to allocate vm_page structures for this memory.
 	 */
 
-	if (vm_nphysseg == 0)
+	if (vm_nphysmem == 0)
 		panic(uvm_page_bootstrap: no memory pre-allocated);
 
 	/*
@@ -384,7 +384,7 @@
 	 */
 
 	freepages = 0;
-	for (lcv = 0 ; lcv  vm_nphysseg ; lcv++)
+	for (lcv = 0 ; lcv  vm_nphysmem ; lcv++)
 		freepages += (vm_physmem[lcv].end - vm_physmem[lcv].start);
 
 	/*
@@ -429,7 +429,7 @@
 	 * init the vm_page structures and put them in the correct place.
 	 */
 
-	for (lcv = 0 ; lcv  vm_nphysseg ; lcv++) {
+	for (lcv = 0 ; lcv  vm_nphysmem ; lcv++) {
 		n = vm_physmem[lcv].end - vm_physmem[lcv].start;
 
 		/* set up page array pointers */
@@ -626,9 +626,9 @@
 
 	/* pass 1: try allocating from a matching end */
 #if (VM_PHYSSEG_STRAT == VM_PSTRAT_BIGFIRST)
-	for (lcv = vm_nphysseg - 1 ; lcv = 0 ; lcv--)
+	for (lcv = vm_nphysmem - 1 ; lcv = 0 ; lcv--)
 #else
-	for (lcv = 0 ; lcv  vm_nphysseg ; lcv++)
+	for (lcv = 0 ; lcv  vm_nphysmem ; lcv++)
 #endif
 	{
 
@@ -647,10 +647,10 @@
 			/* nothing left?   nuke it */
 			if (vm_physmem[lcv].avail_start ==
 			vm_physmem[lcv].end) {
-if (vm_nphysseg == 1)
+if (vm_nphysmem == 1)
 panic(uvm_page_physget: out of memory!);
-vm_nphysseg--;
-for (x = lcv ; x  vm_nphysseg ; x++)
+vm_nphysmem--;
+for (x = lcv ; x  vm_nphysmem ; x++)
 	/* structure copy */
 	vm_physmem[x] = vm_physmem[x+1];
 			}
@@ -666,10 +666,10 @@
 			/* nothing left?   nuke it */
 			if (vm_physmem[lcv].avail_end ==
 			vm_physmem[lcv].start) {
-if (vm_nphysseg == 1)
+if (vm_nphysmem == 1)
 panic(uvm_page_physget: out of memory!);
-vm_nphysseg--;
-for (x = lcv ; x  vm_nphysseg ; x++)
+vm_nphysmem--;
+for (x = lcv ; x  vm_nphysmem ; x++)
 	/* structure copy */
 	vm_physmem[x] = vm_physmem[x+1];
 			}
@@ -679,9 +679,9 @@
 
 	/* pass2: forget about matching ends, just allocate something */
 #if (VM_PHYSSEG_STRAT == VM_PSTRAT_BIGFIRST)
-	for (lcv = vm_nphysseg - 1 ; lcv = 0 ; lcv--)
+	for (lcv = vm_nphysmem - 1 ; lcv = 0 ; lcv--)
 #else
-	for (lcv = 0 ; lcv  vm_nphysseg ; lcv++)
+	for (lcv = 0 ; lcv  vm_nphysmem ; lcv++)
 #endif
 	{
 
@@ -696,10 +696,10 @@
 
 		/* nothing left?   nuke it */
 		if (vm_physmem[lcv].avail_start == vm_physmem[lcv].end) {
-			if (vm_nphysseg == 1)
+			if (vm_nphysmem == 1)
 panic(uvm_page_physget: out of memory!);
-			vm_nphysseg--;
-			for (x = lcv ; x  vm_nphysseg ; x++)
+			vm_nphysmem--;
+			for (x = lcv ; x  vm_nphysmem ; x++)
 /* structure copy */
 vm_physmem[x] = vm_physmem[x+1];
 		}
@@ -751,7 +751,7 @@
 	 * do we have room?
 	 */
 
-	if (vm_nphysseg == VM_PHYSSEG_MAX) {
+	if (vm_nphysmem == VM_PHYSSEG_MAX) {
 		printf(uvm_page_physload: unable to load physical memory 
 		segment\n);
 		printf(\t%d segments allocated, ignoring 0x%llx - 0x%llx\n,
@@ -765,11 +765,11 @@
 	 * called yet, so malloc is not available).
 	 */
 
-	for (lcv = 0 ; lcv  vm_nphysseg ; lcv++) {
+	for (lcv = 0 ; lcv  vm_nphysmem ; lcv++) {
 		if (vm_physmem[lcv].pgs)
 			break;
 	}
-	preload = (lcv == vm_nphysseg);
+	preload = (lcv == vm_nphysmem);
 
 	/*
 	 * if VM is already running, attempt to malloc() vm_page structures
@@ -813,17 +813,17 @@
 
 #if (VM_PHYSSEG_STRAT == VM_PSTRAT_RANDOM)
 	/* random: put it at the end (easy!) */
-	ps = vm_physmem[vm_nphysseg];
+	ps = vm_physmem[vm_nphysmem];
 #elif (VM_PHYSSEG_STRAT == VM_PSTRAT_BSEARCH)
 

CVS commit: [uebayasi-xip] src/sys/uvm

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Tue Feb  9 09:07:34 UTC 2010

Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c uvm_page.h

Log Message:
Define vm_physdev / vm_nphysdev, physical address segment data for managed
device pages.


To generate a diff of this commit:
cvs rdiff -u -r1.153.2.6 -r1.153.2.7 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.59.2.4 -r1.59.2.5 src/sys/uvm/uvm_page.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/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.6 src/sys/uvm/uvm_page.c:1.153.2.7
--- src/sys/uvm/uvm_page.c:1.153.2.6	Tue Feb  9 08:43:33 2010
+++ src/sys/uvm/uvm_page.c	Tue Feb  9 09:07:34 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.6 2010/02/09 08:43:33 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.7 2010/02/09 09:07:34 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,11 +71,12 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.6 2010/02/09 08:43:33 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.7 2010/02/09 09:07:34 uebayasi Exp $);
 
 #include opt_ddb.h
 #include opt_uvmhist.h
 #include opt_readahead.h
+#include opt_xip.h
 
 #include sys/param.h
 #include sys/systm.h
@@ -98,9 +99,14 @@
 /*
  * physical memory config is stored in vm_physmem.
  */
+/* XXXUEBS make these array of pointers */
 
 struct vm_physseg vm_physmem[VM_PHYSSEG_MAX];	/* XXXCDC: uvm.physmem */
 int vm_nphysmem = 0;/* XXXCDC: uvm.nphysmem */
+#ifdef XIP
+struct vm_physseg vm_physdev[VM_PHYSSEG_MAX];	/* XXXCDC: uvm.physdev */
+int vm_nphysdev = 0;/* XXXCDC: uvm.nphysdev */
+#endif
 
 /*
  * Some supported CPUs in a given architecture don't support all
@@ -895,6 +901,16 @@
 	pframe, NULL, offp);
 }
 
+#ifdef XIP
+int
+vm_physseg_find_device(paddr_t pframe, int *offp)
+{
+
+	return VM_PHYSSEG_FIND(vm_physdev, vm_nphysdev, VM_PHYSSEG_OP_PF,
+	pframe, NULL, offp);
+}
+#endif
+
 #if VM_PHYSSEG_MAX == 1
 static inline int
 vm_physseg_find_contig(struct vm_physseg *segs, int nsegs, int op,
@@ -1030,6 +1046,23 @@
 	return(NULL);
 }
 
+#if 0
+#ifdef XIP
+struct vm_page *
+uvm_phys_to_vm_page_device(paddr_t pa)
+{
+	paddr_t pf = atop(pa);
+	int	off;
+	int	psi;
+
+	psi = vm_physseg_find_device(pf, off);
+	if (psi != -1)
+		return(vm_physdev[psi].pgs[off]);
+	return(NULL);
+}
+#endif
+#endif
+
 paddr_t
 uvm_vm_page_to_phys(const struct vm_page *pg)
 {
@@ -2036,7 +2069,11 @@
 uvm_pageismanaged(paddr_t pa)
 {
 
-	return (vm_physseg_find(atop(pa), NULL) != -1);
+	return
+#ifdef XIP
+	(vm_physseg_find_device(atop(pa), NULL) != -1) ||
+#endif
+	(vm_physseg_find(atop(pa), NULL) != -1);
 }
 
 /*

Index: src/sys/uvm/uvm_page.h
diff -u src/sys/uvm/uvm_page.h:1.59.2.4 src/sys/uvm/uvm_page.h:1.59.2.5
--- src/sys/uvm/uvm_page.h:1.59.2.4	Tue Feb  9 08:43:33 2010
+++ src/sys/uvm/uvm_page.h	Tue Feb  9 09:07:34 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.h,v 1.59.2.4 2010/02/09 08:43:33 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.h,v 1.59.2.5 2010/02/09 09:07:34 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -255,6 +255,10 @@
 
 extern struct vm_physseg vm_physmem[VM_PHYSSEG_MAX];
 extern int vm_nphysmem;
+#ifdef XIP
+extern struct vm_physseg vm_physdev[VM_PHYSSEG_MAX];
+extern int vm_nphysdev;
+#endif
 
 #define	vm_nphysseg	vm_nphysmem	/* XXX backward compat */
 
@@ -291,6 +295,9 @@
 int uvm_page_lookup_freelist(struct vm_page *);
 
 int vm_physseg_find(paddr_t, int *);
+#ifdef XIP
+int vm_physseg_find_device(paddr_t, int *);
+#endif
 struct vm_page *uvm_phys_to_vm_page(paddr_t);
 paddr_t uvm_vm_page_to_phys(const struct vm_page *);
 

CVS commit: [uebayasi-xip] src/sys/uvm

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Tue Feb  9 13:06:17 UTC 2010

Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c uvm_page.h

Log Message:
Implement device page struct vm_page * handling.


To generate a diff of this commit:
cvs rdiff -u -r1.153.2.7 -r1.153.2.8 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.59.2.5 -r1.59.2.6 src/sys/uvm/uvm_page.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/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.7 src/sys/uvm/uvm_page.c:1.153.2.8
--- src/sys/uvm/uvm_page.c:1.153.2.7	Tue Feb  9 09:07:34 2010
+++ src/sys/uvm/uvm_page.c	Tue Feb  9 13:06:16 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.7 2010/02/09 09:07:34 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.8 2010/02/09 13:06:16 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.7 2010/02/09 09:07:34 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.8 2010/02/09 13:06:16 uebayasi Exp $);
 
 #include opt_ddb.h
 #include opt_uvmhist.h
@@ -1033,35 +1033,53 @@
  * PHYS_TO_VM_PAGE: find vm_page for a PA.   used by MI code to get vm_pages
  * back from an I/O mapping (ugh!).   used in some MD code as well.
  */
-struct vm_page *
-uvm_phys_to_vm_page(paddr_t pa)
+
+#ifdef XIP
+#define	VM_PAGE_DEVICE_MAGIC		0x2
+#define	VM_PAGE_DEVICE_MAGIC_MASK	0x3
+#define	VM_PAGE_DEVICE_MAGIC_SHIFT	2
+
+static inline struct vm_page *
+VM_PAGE_DEVICE_PA_TO_PG(paddr_t pa)
 {
-	paddr_t pf = atop(pa);
-	int	off;
-	int	psi;
+	paddr_t pf = pa  PAGE_SHIFT;
+	uintptr_t cookie = pf  VM_PAGE_DEVICE_MAGIC_SHIFT;
+	return (void *)(cookie | VM_PAGE_DEVICE_MAGIC);
+}
 
-	psi = vm_physseg_find(pf, off);
-	if (psi != -1)
-		return(vm_physmem[psi].pgs[off]);
-	return(NULL);
+static inline paddr_t
+VM_PAGE_DEVICE_PG_TO_PA(const struct vm_page *pg)
+{
+	uintptr_t cookie = (uintptr_t)pg  ~VM_PAGE_DEVICE_MAGIC_MASK;
+	paddr_t pf = cookie  VM_PAGE_DEVICE_MAGIC_SHIFT;
+	return pf  PAGE_SHIFT;
 }
 
-#if 0
-#ifdef XIP
+bool
+uvm_pageisdevice_p(const struct vm_page *pg)
+{
+
+	return ((uintptr_t)pg  VM_PAGE_DEVICE_MAGIC_MASK) == VM_PAGE_DEVICE_MAGIC;
+}
+#endif
+
 struct vm_page *
-uvm_phys_to_vm_page_device(paddr_t pa)
+uvm_phys_to_vm_page(paddr_t pa)
 {
 	paddr_t pf = atop(pa);
 	int	off;
 	int	psi;
 
+#ifdef XIP
 	psi = vm_physseg_find_device(pf, off);
 	if (psi != -1)
-		return(vm_physdev[psi].pgs[off]);
+		return(VM_PAGE_DEVICE_PA_TO_PG(pa));
+#endif
+	psi = vm_physseg_find(pf, off);
+	if (psi != -1)
+		return(vm_physmem[psi].pgs[off]);
 	return(NULL);
 }
-#endif
-#endif
 
 paddr_t
 uvm_vm_page_to_phys(const struct vm_page *pg)
@@ -1069,6 +1087,11 @@
 	const struct vm_physseg *seg;
 	int psi;
 
+#ifdef XIP
+	if (uvm_pageisdevice_p(pg)) {
+		return VM_PAGE_DEVICE_PG_TO_PA(pg);
+	}
+#endif
 	psi = VM_PHYSSEG_FIND(vm_physmem, vm_nphysmem, VM_PHYSSEG_OP_PG, 0, pg, NULL);
 	KASSERT(psi != -1);
 	seg = vm_physmem[psi];

Index: src/sys/uvm/uvm_page.h
diff -u src/sys/uvm/uvm_page.h:1.59.2.5 src/sys/uvm/uvm_page.h:1.59.2.6
--- src/sys/uvm/uvm_page.h:1.59.2.5	Tue Feb  9 09:07:34 2010
+++ src/sys/uvm/uvm_page.h	Tue Feb  9 13:06:17 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.h,v 1.59.2.5 2010/02/09 09:07:34 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.h,v 1.59.2.6 2010/02/09 13:06:17 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -291,15 +291,20 @@
 void uvm_pagewire(struct vm_page *);
 void uvm_pagezero(struct vm_page *);
 bool uvm_pageismanaged(paddr_t);
+#ifdef XIP
+bool uvm_pageisdevice_p(const struct vm_page *);
+#endif
 
 int uvm_page_lookup_freelist(struct vm_page *);
 
 int vm_physseg_find(paddr_t, int *);
+struct vm_page *uvm_phys_to_vm_page(paddr_t);
+paddr_t uvm_vm_page_to_phys(const struct vm_page *);
 #ifdef XIP
 int vm_physseg_find_device(paddr_t, int *);
+struct vm_page *uvm_phys_to_vm_page_device(paddr_t);
+paddr_t uvm_vm_page_to_phys_device(const struct vm_page *);
 #endif
-struct vm_page *uvm_phys_to_vm_page(paddr_t);
-paddr_t uvm_vm_page_to_phys(const struct vm_page *);
 
 /*
  * macros

CVS commit: src/sys/dev/ic

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Feb  9 13:59:01 UTC 2010

Modified Files:
src/sys/dev/ic: nslm7x.c

Log Message:
Correct setting of bits in the generic thermistor mode.  Cutpaste
error pointed out by njoly@


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/nslm7x.c

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

Modified files:

Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.51 src/sys/dev/ic/nslm7x.c:1.52
--- src/sys/dev/ic/nslm7x.c:1.51	Mon Feb  8 23:10:35 2010
+++ src/sys/dev/ic/nslm7x.c	Tue Feb  9 13:59:01 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: nslm7x.c,v 1.51 2010/02/08 23:10:35 pgoyette Exp $ */
+/*	$NetBSD: nslm7x.c,v 1.52 2010/02/09 13:59:01 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nslm7x.c,v 1.51 2010/02/08 23:10:35 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: nslm7x.c,v 1.52 2010/02/09 13:59:01 pgoyette Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1795,7 +1795,7 @@
 	case 4:	/* Switch to generic thermistor mode */
 		lm_generic_banksel(sc, WB_BANKSEL_B0);
 		regval = (*sc-lm_readreg)(sc, WB_BANK0_VBAT);
-		regval |= 0xe;
+		regval = ~0xe;
 		(*sc-lm_writereg)(sc, WB_BANK0_VBAT, regval);
 		lm_generic_banksel(sc, banksel);
 		aprint_verbose_dev(sc-sc_dev, Thermistor temp sensors\n);

CVS commit: src/usr.bin/hexdump

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Tue Feb  9 14:06:37 UTC 2010

Modified Files:
src/usr.bin/hexdump: conv.c hexdump.c hexdump.h od.1 odsyntax.c

Log Message:
remove agitation that od(1) was deprecated -- it is still POSIX


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/hexdump/conv.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/hexdump/hexdump.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/hexdump/hexdump.h
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/hexdump/od.1
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/hexdump/odsyntax.c

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

Modified files:

Index: src/usr.bin/hexdump/conv.c
diff -u src/usr.bin/hexdump/conv.c:1.12 src/usr.bin/hexdump/conv.c:1.13
--- src/usr.bin/hexdump/conv.c:1.12	Wed Jan  4 01:30:21 2006
+++ src/usr.bin/hexdump/conv.c	Tue Feb  9 14:06:37 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: conv.c,v 1.12 2006/01/04 01:30:21 perry Exp $	*/
+/*	$NetBSD: conv.c,v 1.13 2010/02/09 14:06:37 drochner Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = @(#)conv.c	8.1 (Berkeley) 6/6/93;
 #else
-__RCSID($NetBSD: conv.c,v 1.12 2006/01/04 01:30:21 perry Exp $);
+__RCSID($NetBSD: conv.c,v 1.13 2010/02/09 14:06:37 drochner Exp $);
 #endif
 #endif /* not lint */
 
@@ -61,7 +61,7 @@
 		goto strpr;
 	/* case '\a': */
 	case '\007':
-		if (deprecated)		/* od didn't know about \a */
+		if (odmode)		/* od doesn't know about \a */
 			break;
 		str = \\a;
 		goto strpr;
@@ -81,7 +81,7 @@
 		str = \\t;
 		goto strpr;
 	case '\v':
-		if (deprecated)
+		if (odmode)
 			break;
 		str = \\v;
 		goto strpr;
@@ -112,14 +112,14 @@
 		/* od used nl, not lf */
 	if (*p = 0x1f) {
 		*pr-cchar = 's';
-		if (deprecated  *p == 0x0a)
+		if (odmode  *p == 0x0a)
 			(void)printf(pr-fmt, nl);
 		else
 			(void)printf(pr-fmt, list[*p]);
 	} else if (*p == 0x7f) {
 		*pr-cchar = 's';
 		(void)printf(pr-fmt, del);
-	} else if (deprecated  *p == 0x20) {	/* od replaced space with sp */
+	} else if (odmode  *p == 0x20) {	/* od replaces space with sp */
 		*pr-cchar = 's';
 		(void)printf(pr-fmt,  sp);
 	} else if (isprint(*p)) {

Index: src/usr.bin/hexdump/hexdump.c
diff -u src/usr.bin/hexdump/hexdump.c:1.14 src/usr.bin/hexdump/hexdump.c:1.15
--- src/usr.bin/hexdump/hexdump.c:1.14	Mon Jul 21 14:19:23 2008
+++ src/usr.bin/hexdump/hexdump.c	Tue Feb  9 14:06:37 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: hexdump.c,v 1.14 2008/07/21 14:19:23 lukem Exp $	*/
+/*	$NetBSD: hexdump.c,v 1.15 2010/02/09 14:06:37 drochner Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = @(#)hexdump.c	8.1 (Berkeley) 6/6/93;
 #else
-__RCSID($NetBSD: hexdump.c,v 1.14 2008/07/21 14:19:23 lukem Exp $);
+__RCSID($NetBSD: hexdump.c,v 1.15 2010/02/09 14:06:37 drochner Exp $);
 #endif
 #endif /* not lint */
 
@@ -72,7 +72,7 @@
 	if (!(p = strrchr(argv[0], 'o')) || strcmp(p, od))
 		newsyntax(argc, argv);
 	else
-		oldsyntax(argc, argv);
+		odsyntax(argc, argv);
 
 	/* figure out the data block size */
 	for (blocksize = 0, tfs = fshead; tfs; tfs = tfs-nextfs) {

Index: src/usr.bin/hexdump/hexdump.h
diff -u src/usr.bin/hexdump/hexdump.h:1.10 src/usr.bin/hexdump/hexdump.h:1.11
--- src/usr.bin/hexdump/hexdump.h:1.10	Sat Aug 26 18:17:42 2006
+++ src/usr.bin/hexdump/hexdump.h	Tue Feb  9 14:06:37 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: hexdump.h,v 1.10 2006/08/26 18:17:42 christos Exp $	*/
+/*	$NetBSD: hexdump.h,v 1.11 2010/02/09 14:06:37 drochner Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -71,7 +71,7 @@
 enum _vflag { ALL, DUP, FIRST, WAIT };	/* -v values */
 
 extern int blocksize;			/* data block size */
-extern int deprecated;			/* od compatibility */
+extern int odmode;			/* od compatibility */
 extern FU *endfu;			/* format at end-of-data */
 extern int exitval;			/* final exit value */
 extern FS *fshead;			/* head of format strings list */
@@ -95,7 +95,7 @@
 u_char	*get(void);
 void	 newsyntax(int, char ***);
 int	 next(char **);
-void	 oldsyntax(int, char ***);
+void	 odsyntax(int, char ***);
 void	 rewrite(FS *);
 int	 size(FS *);
 void	 usage(void);

Index: src/usr.bin/hexdump/od.1
diff -u src/usr.bin/hexdump/od.1:1.23 src/usr.bin/hexdump/od.1:1.24
--- src/usr.bin/hexdump/od.1:1.23	Wed Sep  3 16:32:57 2008
+++ src/usr.bin/hexdump/od.1	Tue Feb  9 14:06:37 2010
@@ -1,4 +1,4 @@
-.\  $NetBSD: od.1,v 1.23 2008/09/03 16:32:57 drochner Exp $
+.\  $NetBSD: od.1,v 1.24 2010/02/09 14:06:37 drochner Exp $
 .\
 .\ Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -56,26 +56,6 @@
 .Oc
 .Ar file ...
 .Sh DESCRIPTION
-.Nm
-has been deprecated in favor of
-.Xr hexdump 1 .
-.Pp
-.Xr hexdump 1 ,
-if called as
-.Nm ,
-provides compatibility for the options described below.
-It does not provide compatibility for the
-.Fl s
-option (see
-.Xr strings 1 )
-or the
-.Fl P ,
-.Fl p ,
-or
-.Fl w
-options, nor is compatibility provided for the ``label'' 

CVS commit: src/share/man/man4

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Feb  9 14:10:08 UTC 2010

Modified Files:
src/share/man/man4: lm.4

Log Message:
Document what 'flags 0x0' does, since that's what is used in the
config file samples.

Tnx, njoly@


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/share/man/man4/lm.4

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

Modified files:

Index: src/share/man/man4/lm.4
diff -u src/share/man/man4/lm.4:1.29 src/share/man/man4/lm.4:1.30
--- src/share/man/man4/lm.4:1.29	Mon Feb  8 23:10:35 2010
+++ src/share/man/man4/lm.4	Tue Feb  9 14:10:08 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: lm.4,v 1.29 2010/02/08 23:10:35 pgoyette Exp $
+.\	$NetBSD: lm.4,v 1.30 2010/02/09 14:10:08 pgoyette Exp $
 .\
 .\ Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -108,6 +108,7 @@
 sensor:
 .Bl -column flags Sensor Type -offset indent
 .It Sy flags Ta Sy Sensor Type
+.It Li 0 Ta Thermistor diode (Power-On default)
 .It Li 1 Ta Pentium-II diode
 .It Li 2 Ta 2N3904 Bipolar
 .It Li 4 Ta Thermistor diode

CVS commit: [uebayasi-xip] src/sys/uvm

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Tue Feb  9 14:12:00 UTC 2010

Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c

Log Message:
Give new funcs better names.


To generate a diff of this commit:
cvs rdiff -u -r1.153.2.8 -r1.153.2.9 src/sys/uvm/uvm_page.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_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.8 src/sys/uvm/uvm_page.c:1.153.2.9
--- src/sys/uvm/uvm_page.c:1.153.2.8	Tue Feb  9 13:06:16 2010
+++ src/sys/uvm/uvm_page.c	Tue Feb  9 14:12:00 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.8 2010/02/09 13:06:16 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.9 2010/02/09 14:12:00 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.8 2010/02/09 13:06:16 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.9 2010/02/09 14:12:00 uebayasi Exp $);
 
 #include opt_ddb.h
 #include opt_uvmhist.h
@@ -1035,12 +1035,13 @@
  */
 
 #ifdef XIP
+/* Assume struct vm_page * is aligned to 4 bytes. */
 #define	VM_PAGE_DEVICE_MAGIC		0x2
 #define	VM_PAGE_DEVICE_MAGIC_MASK	0x3
 #define	VM_PAGE_DEVICE_MAGIC_SHIFT	2
 
 static inline struct vm_page *
-VM_PAGE_DEVICE_PA_TO_PG(paddr_t pa)
+PHYS_TO_VM_PAGE_DEVICE(paddr_t pa)
 {
 	paddr_t pf = pa  PAGE_SHIFT;
 	uintptr_t cookie = pf  VM_PAGE_DEVICE_MAGIC_SHIFT;
@@ -1048,7 +1049,7 @@
 }
 
 static inline paddr_t
-VM_PAGE_DEVICE_PG_TO_PA(const struct vm_page *pg)
+VM_PAGE_DEVICE_TO_PHYS(const struct vm_page *pg)
 {
 	uintptr_t cookie = (uintptr_t)pg  ~VM_PAGE_DEVICE_MAGIC_MASK;
 	paddr_t pf = cookie  VM_PAGE_DEVICE_MAGIC_SHIFT;
@@ -1073,7 +1074,7 @@
 #ifdef XIP
 	psi = vm_physseg_find_device(pf, off);
 	if (psi != -1)
-		return(VM_PAGE_DEVICE_PA_TO_PG(pa));
+		return(PHYS_TO_VM_PAGE_DEVICE(pa));
 #endif
 	psi = vm_physseg_find(pf, off);
 	if (psi != -1)
@@ -1089,7 +1090,7 @@
 
 #ifdef XIP
 	if (uvm_pageisdevice_p(pg)) {
-		return VM_PAGE_DEVICE_PG_TO_PA(pg);
+		return VM_PAGE_DEVICE_TO_PHYS(pg);
 	}
 #endif
 	psi = VM_PHYSSEG_FIND(vm_physmem, vm_nphysmem, VM_PHYSSEG_OP_PG, 0, pg, NULL);

CVS commit: src/sys/dev/usb

[Stephen Borrill]

Module Name:src
Committed By:   sborrill
Date:   Tue Feb  9 16:01:17 UTC 2010

Modified Files:
src/sys/dev/usb: ukbd.c

Log Message:
Tweak comment about keyboard mapping.


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/usb/ukbd.c

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

Modified files:

Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.106 src/sys/dev/usb/ukbd.c:1.107
--- src/sys/dev/usb/ukbd.c:1.106	Mon Jan 11 00:18:26 2010
+++ src/sys/dev/usb/ukbd.c	Tue Feb  9 16:01:17 2010
@@ -1,4 +1,4 @@
-/*  $NetBSD: ukbd.c,v 1.106 2010/01/11 00:18:26 pooka Exp $*/
+/*  $NetBSD: ukbd.c,v 1.107 2010/02/09 16:01:17 sborrill Exp $*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.106 2010/01/11 00:18:26 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.107 2010/02/09 16:01:17 sborrill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -100,8 +100,10 @@
  *
  * See http://www.microsoft.com/whdc/archive/scancode.mspx
  *
- * Note: a real pckbd(4) has more complexity in it's
+ * Note: a real pckbd(4) has more complexity in its
  * protocol for some keys than this translation implements.
+ * For example, some keys generate Fake ShiftL events (e0 2a)
+ * before the actual key sequence.
  */
 Static const u_int8_t ukbd_trtab[256] = {
   NN,   NN,   NN,   NN, 0x1e, 0x30, 0x2e, 0x20, /* 00 - 07 */

CVS commit: src/sys/rump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Feb  9 16:16:26 UTC 2010

Modified Files:
src/sys/rump: Makefile.rump

Log Message:
IOCONFIG comes from .CURDIR


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/rump/Makefile.rump

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

Modified files:

Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.48 src/sys/rump/Makefile.rump:1.49
--- src/sys/rump/Makefile.rump:1.48	Wed Feb  3 21:15:39 2010
+++ src/sys/rump/Makefile.rump	Tue Feb  9 16:16:26 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rump,v 1.48 2010/02/03 21:15:39 pooka Exp $
+#	$NetBSD: Makefile.rump,v 1.49 2010/02/09 16:16:26 pooka Exp $
 #
 
 WARNS?=		3	# XXX: src/sys won't compile with -Wsign-compare yet
@@ -105,7 +105,7 @@
 # This is useful mainly for devices.
 .if !empty(IOCONFIG)
 ioconf.c: ${IOCONFIG}
-	${TOOL_CONFIG} -b ${.OBJDIR} -s ${RUMPTOP}/.. ${IOCONFIG} 
+	${TOOL_CONFIG} -b ${.OBJDIR} -s ${RUMPTOP}/.. ${.CURDIR}/${IOCONFIG}
 	# config doesn't change the files if they're unchanged.  however,
 	# here we want to satisfy our make dependency, so force a
 	# timestamp update

CVS commit: src/sys/compat/linux/arch/amd64

[Nicolas Joly]

Module Name:src
Committed By:   njoly
Date:   Tue Feb  9 16:46:07 UTC 2010

Modified Files:
src/sys/compat/linux/arch/amd64: linux_exec_machdep.c

Log Message:
Small typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/compat/linux/arch/amd64/linux_exec_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/compat/linux/arch/amd64/linux_exec_machdep.c
diff -u src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.16 src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.17
--- src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.16	Sun Mar 29 01:02:50 2009
+++ src/sys/compat/linux/arch/amd64/linux_exec_machdep.c	Tue Feb  9 16:46:07 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_exec_machdep.c,v 1.16 2009/03/29 01:02:50 mrg Exp $ */
+/*	$NetBSD: linux_exec_machdep.c,v 1.17 2010/02/09 16:46:07 njoly Exp $ */
 
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_exec_machdep.c,v 1.16 2009/03/29 01:02:50 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_exec_machdep.c,v 1.17 2010/02/09 16:46:07 njoly Exp $);
 
 #ifdef __amd64__
 #define ELFSIZE 64
@@ -152,7 +152,7 @@
 	eh = (Elf_Ehdr *)pack-ep_hdr;
 
 	/*
-	 * We forgot this, so we ned to reload it now. XXX keep track of it?
+	 * We forgot this, so we need to reload it now. XXX keep track of it?
 	 */
 	if (ap == NULL) {
 		phsize = eh-e_phnum * sizeof(Elf_Phdr);

CVS commit: src/sys/rump/librump/rumpkern

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Feb  9 16:53:13 UTC 2010

Modified Files:
src/sys/rump/librump/rumpkern: rump.c threads.c

Log Message:
Store l_name for kernel threads.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpkern/threads.c

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

Modified files:

Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.151 src/sys/rump/librump/rumpkern/rump.c:1.152
--- src/sys/rump/librump/rumpkern/rump.c:1.151	Fri Jan 15 20:39:46 2010
+++ src/sys/rump/librump/rumpkern/rump.c	Tue Feb  9 16:53:13 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.c,v 1.151 2010/01/15 20:39:46 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.152 2010/02/09 16:53:13 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.151 2010/01/15 20:39:46 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.152 2010/02/09 16:53:13 pooka Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -502,6 +502,8 @@
 
 	KASSERT(l-l_flag  LW_WEXIT);
 	KASSERT(l-l_mutex == NULL);
+	if (l-l_name)
+		kmem_free(l-l_name, MAXCOMLEN);
 	kmem_free(l, sizeof(*l));
 }
 

Index: src/sys/rump/librump/rumpkern/threads.c
diff -u src/sys/rump/librump/rumpkern/threads.c:1.7 src/sys/rump/librump/rumpkern/threads.c:1.8
--- src/sys/rump/librump/rumpkern/threads.c:1.7	Wed Jan 27 20:16:16 2010
+++ src/sys/rump/librump/rumpkern/threads.c	Tue Feb  9 16:53:13 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: threads.c,v 1.7 2010/01/27 20:16:16 pooka Exp $	*/
+/*	$NetBSD: threads.c,v 1.8 2010/02/09 16:53:13 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2009 Antti Kantee.  All Rights Reserved.
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: threads.c,v 1.7 2010/01/27 20:16:16 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: threads.c,v 1.8 2010/02/09 16:53:13 pooka Exp $);
 
 #include sys/param.h
 #include sys/kmem.h
@@ -144,6 +144,11 @@
 		l-l_pflag |= LP_BOUND;
 		l-l_cpu = ci;
 	}
+	if (thrname) {
+		l-l_name = kmem_alloc(MAXCOMLEN, KM_SLEEP);
+		strlcpy(l-l_name, thrname, MAXCOMLEN);
+	}
+		
 	rv = rumpuser_thread_create(threadbouncer, k, thrname);
 	if (rv)
 		return rv;

CVS commit: src/sys/rump/include/machine

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Feb  9 17:33:31 UTC 2010

Added Files:
src/sys/rump/include/machine: bus.h

Log Message:
Add a bus.h blanket header which forces definition of bus space /
bus dma interfaces as functions and therefore makes it possible to
use rump on archs which suffer from macro maladies, i.e. everything
except i386 and amd64.

(build-tested on sparc64 and vax, which are usually the two extremes
of weirdness in these cases)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/machine/bus.h

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

Added files:

Index: src/sys/rump/include/machine/bus.h
diff -u /dev/null src/sys/rump/include/machine/bus.h:1.1
--- /dev/null	Tue Feb  9 17:33:31 2010
+++ src/sys/rump/include/machine/bus.h	Tue Feb  9 17:33:31 2010
@@ -0,0 +1,58 @@
+/*	$NetBSD: bus.h,v 1.1 2010/02/09 17:33:31 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _SYS_RUMP_BUS_H_
+#define _SYS_RUMP_BUS_H_
+
+/*
+ * This is a blanket header for archs which are inline/macro-happy
+ * in their bus.h header.  Currently, this is anything but x86.
+ * After an arch is cured from inline scurvy, the native bus.h
+ * should be used.
+ */
+
+/* bus space defs */
+typedef int bus_addr_t;
+typedef int bus_size_t;
+typedef int bus_space_tag_t;
+typedef int bus_space_handle_t;
+
+/* bus dma defs */
+typedef int *bus_dma_tag_t;
+
+typedef struct {
+	bus_addr_t ds_addr;
+	bus_size_t ds_len;
+} bus_dma_segment_t;
+
+typedef struct {
+	bus_dma_segment_t dm_segs[1];
+} *bus_dmamap_t;
+
+#include sys/bus_proto.h
+
+#endif /* _SYS_RUMP_BUS_H_ */

CVS commit: src/sys/arch

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Tue Feb  9 18:13:10 UTC 2010

Modified Files:
src/sys/arch/amiga/amiga: device.h
src/sys/arch/amiga/dev: atzsc.c grf_cvreg.h gtsc.c
src/sys/arch/amiga/include: cpu.h
src/sys/arch/amigappc/include: cpu.h

Log Message:
Moved the macros amiga_cpu_sync() and amiga_membarrier() from amiga/device.h
to the MD include/cpu.h.
Also make sure that grf_cvreg.h includes cpu.h as it is needed by Xamiga
in xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amiga/amiga/device.h
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amiga/dev/atzsc.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/grf_cvreg.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/amiga/dev/gtsc.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/amiga/include/cpu.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amigappc/include/cpu.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/amiga/amiga/device.h
diff -u src/sys/arch/amiga/amiga/device.h:1.12 src/sys/arch/amiga/amiga/device.h:1.13
--- src/sys/arch/amiga/amiga/device.h:1.12	Fri Feb  5 12:13:36 2010
+++ src/sys/arch/amiga/amiga/device.h	Tue Feb  9 18:13:09 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: device.h,v 1.12 2010/02/05 12:13:36 phx Exp $	*/
+/*	$NetBSD: device.h,v 1.13 2010/02/09 18:13:09 phx Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -49,22 +49,4 @@
 
 #define getsoftc(cdnam, unit)	device_lookup_private((cdnam), (unit))
 
-/*
- * Reorder protection when accessing device registers.
- */
-#if defined(__m68k__)
-#define amiga_membarrier()
-#elif defined(__powerpc__)
-#define amiga_membarrier() __asm volatile (eieio)
-#endif
-
-/*
- * Finish all bus operations and flush pipelines.
- */
-#if defined(__m68k__)
-#define amiga_cpu_sync() __asm volatile (nop)
-#elif defined(__powerpc__)
-#define amiga_cpu_sync() __asm volatile (sync; isync)
-#endif
-
 #endif /* _AMIGA_DEVICE_H_ */

Index: src/sys/arch/amiga/dev/atzsc.c
diff -u src/sys/arch/amiga/dev/atzsc.c:1.41 src/sys/arch/amiga/dev/atzsc.c:1.42
--- src/sys/arch/amiga/dev/atzsc.c:1.41	Sun Feb  7 12:52:04 2010
+++ src/sys/arch/amiga/dev/atzsc.c	Tue Feb  9 18:13:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: atzsc.c,v 1.41 2010/02/07 12:52:04 he Exp $ */
+/*	$NetBSD: atzsc.c,v 1.42 2010/02/09 18:13:10 phx Exp $ */
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -66,13 +66,14 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atzsc.c,v 1.41 2010/02/07 12:52:04 he Exp $);
+__KERNEL_RCSID(0, $NetBSD: atzsc.c,v 1.42 2010/02/09 18:13:10 phx Exp $);
 
 #include sys/param.h
 #include sys/systm.h
 #include sys/kernel.h
 #include sys/device.h
 #include sys/intr.h
+#include machine/cpu.h
 #include dev/scsipi/scsi_all.h
 #include dev/scsipi/scsipi_all.h
 #include dev/scsipi/scsiconf.h

Index: src/sys/arch/amiga/dev/grf_cvreg.h
diff -u src/sys/arch/amiga/dev/grf_cvreg.h:1.15 src/sys/arch/amiga/dev/grf_cvreg.h:1.16
--- src/sys/arch/amiga/dev/grf_cvreg.h:1.15	Fri Feb  5 12:13:36 2010
+++ src/sys/arch/amiga/dev/grf_cvreg.h	Tue Feb  9 18:13:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cvreg.h,v 1.15 2010/02/05 12:13:36 phx Exp $	*/
+/*	$NetBSD: grf_cvreg.h,v 1.16 2010/02/09 18:13:10 phx Exp $	*/
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -34,6 +34,8 @@
 #ifndef _GRF_CVREG_H
 #define _GRF_CVREG_H
 
+#include machine/cpu.h
+
 /*
  * This is derived from ciruss driver source
  */

Index: src/sys/arch/amiga/dev/gtsc.c
diff -u src/sys/arch/amiga/dev/gtsc.c:1.39 src/sys/arch/amiga/dev/gtsc.c:1.40
--- src/sys/arch/amiga/dev/gtsc.c:1.39	Fri Feb  5 12:13:36 2010
+++ src/sys/arch/amiga/dev/gtsc.c	Tue Feb  9 18:13:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: gtsc.c,v 1.39 2010/02/05 12:13:36 phx Exp $ */
+/*	$NetBSD: gtsc.c,v 1.40 2010/02/09 18:13:10 phx Exp $ */
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -66,13 +66,14 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gtsc.c,v 1.39 2010/02/05 12:13:36 phx Exp $);
+__KERNEL_RCSID(0, $NetBSD: gtsc.c,v 1.40 2010/02/09 18:13:10 phx Exp $);
 
 #include sys/param.h
 #include sys/systm.h
 #include sys/kernel.h
 #include sys/device.h
 #include sys/intr.h
+#include machine/cpu.h
 #include dev/scsipi/scsi_all.h
 #include dev/scsipi/scsipi_all.h
 #include dev/scsipi/scsiconf.h

Index: src/sys/arch/amiga/include/cpu.h
diff -u src/sys/arch/amiga/include/cpu.h:1.74 src/sys/arch/amiga/include/cpu.h:1.75
--- src/sys/arch/amiga/include/cpu.h:1.74	Mon Nov 23 00:11:43 2009
+++ src/sys/arch/amiga/include/cpu.h	Tue Feb  9 18:13:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.74 2009/11/23 00:11:43 rmind Exp $	*/
+/*	$NetBSD: cpu.h,v 1.75 2010/02/09 18:13:10 phx Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -237,4 +237,14 @@
 
 #endif /* _KERNEL */
 
+/*
+ * Reorder protection when 

CVS commit: src/sys/rump/dev/wip/librumpusbhc

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Feb  9 18:27:17 UTC 2010

Modified Files:
src/sys/rump/dev/wip/librumpusbhc: rumpusbhc.c

Log Message:
* UR_CBI_ADSC ctrl req fails with EIO sometime for unknown reasons.
  Let it instead of panicking.  Doesn't seem to affect functionality.
* process pipe queue only until it is empty


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c

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

Modified files:

Index: src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c
diff -u src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c:1.14 src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c:1.15
--- src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c:1.14	Wed Feb  3 21:18:38 2010
+++ src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c	Tue Feb  9 18:27:17 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpusbhc.c,v 1.14 2010/02/03 21:18:38 pooka Exp $	*/
+/*	$NetBSD: rumpusbhc.c,v 1.15 2010/02/09 18:27:17 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpusbhc.c,v 1.14 2010/02/03 21:18:38 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpusbhc.c,v 1.15 2010/02/09 18:27:17 pooka Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -365,7 +365,7 @@
 	int len, totlen;
 	int value;
 	int err = 0;
-	int ru_error;
+	int ru_error, mightfail = 0;
 
 	len = totlen = UGETW(req-wLength);
 	if (len)
@@ -462,9 +462,20 @@
 		}
 
 	/*
+	 * This request might fail unknown reasons.  EIO doesn't
+	 * give much help, and debugging the host ugen would be
+	 * necessary.  However, since it doesn't seem to really
+	 * affect anything, just let it fail for now.
+	 */
+	case C(0x00, UT_WRITE_CLASS_INTERFACE):
+		mightfail = 1;
+		/*FALLTHROUGH*/
+
+	/*
 	 * XXX: don't wildcard these yet.  I want to better figure
 	 * out what to trap here.  This is kinda silly, though ...
 	 */
+
 	case C(0x01, UT_WRITE_VENDOR_DEVICE):
 	case C(0x06, UT_WRITE_VENDOR_DEVICE):
 	case C(0x07, UT_READ_VENDOR_DEVICE):
@@ -475,7 +486,6 @@
 	case C(UR_GET_STATUS, UT_READ_CLASS_DEVICE):
 	case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE):
 	case C(UR_GET_DESCRIPTOR, UT_READ_INTERFACE):
-	case C(0x00, UT_WRITE_CLASS_INTERFACE):
 	case C(0xff, UT_WRITE_CLASS_INTERFACE):
 	case C(0x20, UT_WRITE_CLASS_INTERFACE):
 	case C(0x22, UT_WRITE_CLASS_INTERFACE):
@@ -491,7 +501,10 @@
 		ucr.ucr_data = buf;
 		if (rumpuser_ioctl(sc-sc_ugenfd[UGEN_EPT_CTRL],
 		USB_DO_REQUEST, ucr, ru_error) == -1) {
-			panic(request failed);
+			if (!mightfail)
+panic(request failed: %d, ru_error);
+			else
+err = ru_error;
 		}
 		}
 		break;
@@ -715,17 +728,10 @@
 doxfer_kth(void *arg)
 {
 	usbd_xfer_handle xfer = arg;
-	usb_endpoint_descriptor_t *ed = xfer-pipe-endpoint-edesc;
-	bool repeat;
-
-	if ((ed-bmAttributes  UE_XFERTYPE) == UE_INTERRUPT)
-		repeat = true;
-	else
-		repeat = false;
 
 	do {
 		rumpusb_device_bulk_start(SIMPLEQ_FIRST(xfer-pipe-queue));
-	} while (repeat);
+	} while (!SIMPLEQ_EMPTY(xfer-pipe-queue));
 	kthread_exit(0);
 }
 

CVS commit: src/sys/rump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Feb  9 18:57:03 UTC 2010

Modified Files:
src/sys/rump/dev/wip/libusb: Makefile
src/sys/rump/librump/rumpdev: Makefile.rumpdev
Added Files:
src/sys/rump/librump/rumpdev: rumpdma.c
Removed Files:
src/sys/rump/dev/wip/libusb: bus_dma.c

Log Message:
Now that there is a working bus.h for all architectures, move rump
bus dma out of a wip place and into rumpdev where it belongs.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libusb/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/wip/libusb/bus_dma.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpdev/Makefile.rumpdev
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpdev/rumpdma.c

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

Modified files:

Index: src/sys/rump/dev/wip/libusb/Makefile
diff -u src/sys/rump/dev/wip/libusb/Makefile:1.3 src/sys/rump/dev/wip/libusb/Makefile:1.4
--- src/sys/rump/dev/wip/libusb/Makefile:1.3	Wed Feb  3 21:18:38 2010
+++ src/sys/rump/dev/wip/libusb/Makefile	Tue Feb  9 18:57:03 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/02/03 21:18:38 pooka Exp $
+#	$NetBSD: Makefile,v 1.4 2010/02/09 18:57:03 pooka Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev/usb
@@ -8,9 +8,6 @@
 SRCS=	usb.c usbdi.c usbdi_util.c usb_mem.c usb_subr.c usb_quirks.c	\
 	uhub.c usbroothub_subr.c
 
-# XXX: doesn't belong here by a longshot, but it's the easy choice for now
-SRCS+=	bus_dma.c
-
 #CPPFLAGS+= -DUHUB_DEBUG
 
 CFLAGS+=	-Wno-pointer-sign

Index: src/sys/rump/librump/rumpdev/Makefile.rumpdev
diff -u src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.3 src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.4
--- src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.3	Sat Jan  9 16:29:32 2010
+++ src/sys/rump/librump/rumpdev/Makefile.rumpdev	Tue Feb  9 18:57:03 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpdev,v 1.3 2010/01/09 16:29:32 pooka Exp $
+#	$NetBSD: Makefile.rumpdev,v 1.4 2010/02/09 18:57:03 pooka Exp $
 #
 
 .include ${RUMPTOP}/Makefile.rump
@@ -8,7 +8,7 @@
 .PATH:	${RUMPTOP}/librump/rumpdev\
 	${RUMPTOP}/../kern
 
-SRCS=	rump_dev.c autoconf.c
+SRCS=	rump_dev.c autoconf.c rumpdma.c
 
 # sys/kern
 SRCS+=	kern_pmf.c subr_autoconf.c

Added files:

Index: src/sys/rump/librump/rumpdev/rumpdma.c
diff -u /dev/null src/sys/rump/librump/rumpdev/rumpdma.c:1.1
--- /dev/null	Tue Feb  9 18:57:03 2010
+++ src/sys/rump/librump/rumpdev/rumpdma.c	Tue Feb  9 18:57:03 2010
@@ -0,0 +1,112 @@
+/*	$NetBSD: rumpdma.c,v 1.1 2010/02/09 18:57:03 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/param.h
+#include sys/types.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/kmem.h
+
+#include machine/bus.h
+
+/*
+ * bus dma implementation for rump.
+ *
+ * In it's current sorry state, this functions with USB drivers.
+ */
+
+int
+bus_dmamap_create(bus_dma_tag_t tag, bus_size_t sz, int flag, bus_size_t bsz,
+	bus_size_t bsz2, int i, bus_dmamap_t *ptr)
+{
+
+	return 0;
+}
+
+void
+bus_dmamap_destroy(bus_dma_tag_t tag, bus_dmamap_t map)
+{
+
+	panic(unimplemented %s, __func__);
+}
+
+int
+bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t a, void *b, bus_size_t c,
+	struct proc *d, int e)
+{
+
+	return 0;
+}
+
+void
+bus_dmamap_unload(bus_dma_tag_t a, bus_dmamap_t b)
+{
+
+	panic(unimplemented %s, __func__);
+}
+
+void
+bus_dmamap_sync(bus_dma_tag_t a, bus_dmamap_t b, bus_addr_t c,
+	bus_size_t d, int e)
+{
+
+	panic(unimplemented %s, __func__);
+}
+
+int
+bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size, bus_size_t align,
+	bus_size_t boundary, bus_dma_segment_t *segs, int 

CVS commit: src/sys/rump/dev/wip/libumass

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Tue Feb  9 19:02:19 UTC 2010

Modified Files:
src/sys/rump/dev/wip/libumass: Makefile UMASS.ioconf
sd_at_scsibus_at_umass.c

Log Message:
add c...@scsi and c...@atapi (untested. if you have a usb cd drive, let me know)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libumass/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/wip/libumass/UMASS.ioconf
cvs rdiff -u -r1.7 -r1.8 \
src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c

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

Modified files:

Index: src/sys/rump/dev/wip/libumass/Makefile
diff -u src/sys/rump/dev/wip/libumass/Makefile:1.3 src/sys/rump/dev/wip/libumass/Makefile:1.4
--- src/sys/rump/dev/wip/libumass/Makefile:1.3	Wed Feb  3 21:18:38 2010
+++ src/sys/rump/dev/wip/libumass/Makefile	Tue Feb  9 19:02:19 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/02/03 21:18:38 pooka Exp $
+#	$NetBSD: Makefile,v 1.4 2010/02/09 19:02:19 pooka Exp $
 #
 #
 # umass.  includes scsibus+sd for simplicity due to the umass code
@@ -10,9 +10,11 @@
 LIB=	rumpdev_umass
 
 SRCS=	umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
-SRCS+=	scsipiconf.c scsipi_base.c scsipi_ioctl.c scsi_base.c scsiconf.c sd.c
+SRCS+=	scsipiconf.c scsipi_base.c scsipi_ioctl.c scsi_base.c scsiconf.c
 SRCS+=	atapi_base.c atapiconf.c
 
+SRCS+=	cd.c sd.c
+
 SRCS+=	sd_at_scsibus_at_umass.c
 
 IOCONFIG= UMASS.ioconf

Index: src/sys/rump/dev/wip/libumass/UMASS.ioconf
diff -u src/sys/rump/dev/wip/libumass/UMASS.ioconf:1.2 src/sys/rump/dev/wip/libumass/UMASS.ioconf:1.3
--- src/sys/rump/dev/wip/libumass/UMASS.ioconf:1.2	Thu Feb  4 00:37:08 2010
+++ src/sys/rump/dev/wip/libumass/UMASS.ioconf	Tue Feb  9 19:02:19 2010
@@ -1,4 +1,11 @@
-#	$NetBSD: UMASS.ioconf,v 1.2 2010/02/04 00:37:08 pooka Exp $
+#	$NetBSD: UMASS.ioconf,v 1.3 2010/02/09 19:02:19 pooka Exp $
+#
+
+#
+# Technically we should not have drive components (sd, cd) in here,
+# since in the future we might want to attach them via a completely
+# separate mechanism (say, with the scsi host controller in rump).
+# But, bundle them up for now.
 #
 
 ioconf umass
@@ -10,8 +17,15 @@
 
 # USB Mass Storage
 umass*	at uhub? port ? configuration ? interface ?
+
+# SCSI support
 scsibus* at scsi?
 sd*	at scsibus? target ? lun ?
 
+# ATAPI support
 atapibus* at atapi?
-sd*	at atapibus? drive ?
+sd*	at atapibus? drive ? flags 0x
+
+# cd drives (untested!)
+cd*	at scsibus? target ? lun ?
+cd*	at atapibus? drive ? flags 0x

Index: src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c
diff -u src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c:1.7 src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c:1.8
--- src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c:1.7	Wed Feb  3 21:18:38 2010
+++ src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c	Tue Feb  9 19:02:19 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd_at_scsibus_at_umass.c,v 1.7 2010/02/03 21:18:38 pooka Exp $	*/
+/*	$NetBSD: sd_at_scsibus_at_umass.c,v 1.8 2010/02/09 19:02:19 pooka Exp $	*/
 
 #include sys/param.h
 #include sys/conf.h
@@ -23,7 +23,7 @@
 {
 	extern struct cfattach rumpusbhc_ca;
 	extern struct cfattach usb_ca, uhub_ca, uroothub_ca, umass_ca;
-	extern struct cfattach scsibus_ca, atapibus_ca, sd_ca;
+	extern struct cfattach scsibus_ca, atapibus_ca, sd_ca, cd_ca;
 	extern struct bdevsw sd_bdevsw;
 	extern struct cdevsw sd_cdevsw;
 	devmajor_t bmaj, cmaj;
@@ -54,6 +54,9 @@
 	FLAWLESSCALL(config_cfdriver_attach(sd_cd));
 	FLAWLESSCALL(config_cfattach_attach(sd, sd_ca));
 
+	FLAWLESSCALL(config_cfdriver_attach(cd_cd));
+	FLAWLESSCALL(config_cfattach_attach(cd, cd_ca));
+
 	FLAWLESSCALL(config_cfattach_attach(uhub, uroothub_ca));
 
 	bmaj = cmaj = -1;

CVS commit: src/lib/libterminfo

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Feb  9 22:16:12 UTC 2010

Modified Files:
src/lib/libterminfo: Makefile
Removed Files:
src/lib/libterminfo: terminfo.5

Log Message:
We should always generate terminfo.5 to save human error syncing.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/Makefile
cvs rdiff -u -r1.5 -r0 src/lib/libterminfo/terminfo.5

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/Makefile
diff -u src/lib/libterminfo/Makefile:1.3 src/lib/libterminfo/Makefile:1.4
--- src/lib/libterminfo/Makefile:1.3	Wed Feb  3 20:56:54 2010
+++ src/lib/libterminfo/Makefile	Tue Feb  9 22:16:12 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/02/03 20:56:54 roy Exp $
+#	$NetBSD: Makefile,v 1.4 2010/02/09 22:16:12 roy Exp $
 
 USE_SHLIBDIR=	yes
 
@@ -38,9 +38,11 @@
 		cd ${.CURDIR}  ${HOST_SH} ./genthash termcap_hash.c
 
 # Generate our man pages
-man:
+terminfo.5: terminfo.5.in term.h termcap_map.c
 		@echo Generating terminfo man pages
-		cd ${.CURDIR}  ${HOST_SH} ./genman terminfo.5
+		cd ${.CURDIR}  ${HOST_SH} ./genman ${.OBJDIR}/$@
+
+man: terminfo.5
 
 gen: hash man
 

CVS commit: src/sys/arch/i386/conf

[Antoine Reilles]

Module Name:src
Committed By:   tonio
Date:   Tue Feb  9 22:38:32 UTC 2010

Modified Files:
src/sys/arch/i386/conf: ALL GENERIC

Log Message:
Add TEMPer and TERMPerHUM driver


To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.965 -r1.966 src/sys/arch/i386/conf/GENERIC

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

Modified files:

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.235 src/sys/arch/i386/conf/ALL:1.236
--- src/sys/arch/i386/conf/ALL:1.235	Tue Feb  9 03:19:50 2010
+++ src/sys/arch/i386/conf/ALL	Tue Feb  9 22:38:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.235 2010/02/09 03:19:50 cnst Exp $
+# $NetBSD: ALL,v 1.236 2010/02/09 22:38:32 tonio Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		ALL-$Revision: 1.235 $
+#ident 		ALL-$Revision: 1.236 $
 
 maxusers	64		# estimated number of users
 
@@ -1171,6 +1171,9 @@
 ukbd*	at uhidev? reportid ?
 wskbd*	at ukbd? console ? mux 1
 
+# USB TERMPer and TEMPerHUM
+uthum*	at uhidev? reportid ?
+
 # USB serial adapter
 ucycom* at uhidev? reportid ?
 

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.965 src/sys/arch/i386/conf/GENERIC:1.966
--- src/sys/arch/i386/conf/GENERIC:1.965	Tue Feb  9 03:19:50 2010
+++ src/sys/arch/i386/conf/GENERIC	Tue Feb  9 22:38:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.965 2010/02/09 03:19:50 cnst Exp $
+# $NetBSD: GENERIC,v 1.966 2010/02/09 22:38:32 tonio Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.965 $
+#ident 		GENERIC-$Revision: 1.966 $
 
 maxusers	64		# estimated number of users
 
@@ -1118,6 +1118,9 @@
 ukbd*	at uhidev? reportid ?
 wskbd*	at ukbd? console ? mux 1
 
+# USB TERMPer and TEMPerHUM
+uthum*	at uhidev? reportid ?
+
 # USB serial adapter
 ucycom* at uhidev? reportid ?
 

CVS commit: src/sys/arch/i386/conf

[Antoine Reilles]

Module Name:src
Committed By:   tonio
Date:   Tue Feb  9 22:44:43 UTC 2010

Modified Files:
src/sys/arch/i386/conf: std.i386

Log Message:
Fix typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/conf/std.i386

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

Modified files:

Index: src/sys/arch/i386/conf/std.i386
diff -u src/sys/arch/i386/conf/std.i386:1.29 src/sys/arch/i386/conf/std.i386:1.30
--- src/sys/arch/i386/conf/std.i386:1.29	Thu Dec 11 05:42:18 2008
+++ src/sys/arch/i386/conf/std.i386	Tue Feb  9 22:44:43 2010
@@ -1,4 +1,4 @@
-# $NetBSD: std.i386,v 1.29 2008/12/11 05:42:18 alc Exp $
+# $NetBSD: std.i386,v 1.30 2010/02/09 22:44:43 tonio Exp $
 #
 # standard, required NetBSD/i386 'options'
 
@@ -13,7 +13,7 @@
 #options 	CRYPTO_MD_DES_CBC	# machine-dependant DES CBC code
 #options 	CRYPTO_MD_BF_ENC	# machine-dependant code for BF_encrypt
 #options 	CRYPTO_MD_BF_CBC	# careful: uses bswapl, requires 486
-options		MULTIPROCESSOR		# multiprocessor supprot
+options		MULTIPROCESSOR		# multiprocessor support
 options 	MPBIOS			# configure CPUs and APICs using MPBIOS
 
 mainbus0 at root

CVS commit: src/sys/arch

[Jean-Yves Migeon]

Module Name:src
Committed By:   jym
Date:   Tue Feb  9 22:51:14 UTC 2010

Modified Files:
src/sys/arch/i386/include: pmap.h
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: pmap.c

Log Message:
Fix typos in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/i386/include/pmap.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/x86/x86/pmap.c

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

Modified files:

Index: src/sys/arch/i386/include/pmap.h
diff -u src/sys/arch/i386/include/pmap.h:1.103 src/sys/arch/i386/include/pmap.h:1.104
--- src/sys/arch/i386/include/pmap.h:1.103	Sun Oct 26 06:57:30 2008
+++ src/sys/arch/i386/include/pmap.h	Tue Feb  9 22:51:13 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.103 2008/10/26 06:57:30 mrg Exp $	*/
+/*	$NetBSD: pmap.h,v 1.104 2010/02/09 22:51:13 jym Exp $	*/
 
 /*
  *
@@ -192,7 +192,7 @@
  * last entry of the L3 PD, which makes it hard to use one L3 page per pmap
  * switch %cr3 to switch pmaps. So we use one static L3 page which is
  * always loaded in %cr3, and we use it as 2 virtual PD pointers: one for
- * kenrel space (L3[3], always loaded), and one for user space (in fact the
+ * kernel space (L3[3], always loaded), and one for user space (in fact the
  * first 3 entries of the L3 PD), and we claim the VM has only a 2-level
  * PTP (with the L2 index extended by 2 bytes).
  * PTE_BASE and APTE_BASE will need 4 entries in the L2 page table.

Index: src/sys/arch/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.28 src/sys/arch/x86/include/pmap.h:1.29
--- src/sys/arch/x86/include/pmap.h:1.28	Wed Nov 11 17:08:16 2009
+++ src/sys/arch/x86/include/pmap.h	Tue Feb  9 22:51:13 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.28 2009/11/11 17:08:16 cegger Exp $	*/
+/*	$NetBSD: pmap.h,v 1.29 2010/02/09 22:51:13 jym Exp $	*/
 
 /*
  *
@@ -106,7 +106,7 @@
 
 #define ptp_va2o(va, lvl)	(pl_i(va, (lvl)+1) * PAGE_SIZE)
 
-/* size of a PDP: usually one page, exept for PAE */
+/* size of a PDP: usually one page, except for PAE */
 #ifdef PAE
 #define PDP_SIZE 4
 #else

Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.100 src/sys/arch/x86/x86/pmap.c:1.101
--- src/sys/arch/x86/x86/pmap.c:1.100	Sun Jan 31 00:43:37 2010
+++ src/sys/arch/x86/x86/pmap.c	Tue Feb  9 22:51:14 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.100 2010/01/31 00:43:37 hubertf Exp $	*/
+/*	$NetBSD: pmap.c,v 1.101 2010/02/09 22:51:14 jym Exp $	*/
 
 /*
  * Copyright (c) 2007 Manuel Bouyer.
@@ -149,7 +149,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.100 2010/01/31 00:43:37 hubertf Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.101 2010/02/09 22:51:14 jym Exp $);
 
 #include opt_user_ldt.h
 #include opt_lockdebug.h
@@ -406,7 +406,7 @@
 
 #ifdef XEN
 #ifdef __x86_64__
-/* Dummy PGD for user cr3, used between pmap_deacivate() and pmap_activate() */
+/* Dummy PGD for user cr3, used between pmap_deactivate() and pmap_activate() */
 static paddr_t xen_dummy_user_pgd;
 /* Currently active user PGD (can't use rcr3()) */
 static paddr_t xen_current_user_pgd = 0;

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Feb  9 22:59:41 UTC 2010

Modified Files:
src/share/man/man4: aibs.4

Log Message:
Add another comma in Nd, noted by dogcow.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/aibs.4

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

Modified files:

Index: src/share/man/man4/aibs.4
diff -u src/share/man/man4/aibs.4:1.3 src/share/man/man4/aibs.4:1.4
--- src/share/man/man4/aibs.4:1.3	Tue Feb  9 06:47:52 2010
+++ src/share/man/man4/aibs.4	Tue Feb  9 22:59:41 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: aibs.4,v 1.3 2010/02/09 06:47:52 wiz Exp $
+.\	$NetBSD: aibs.4,v 1.4 2010/02/09 22:59:41 wiz Exp $
 .\	$OpenBSD: aibs.4,v 1.4 2009/07/30 06:30:45 jmc Exp $
 .\
 .\ Copyright (c) 2009 Constantine A. Murenin cnst+net...@bugmail.mojo.ru
@@ -20,7 +20,7 @@
 .Os
 .Sh NAME
 .Nm aibs
-.Nd ASUSTeK AI Booster ACPI ATK0110 voltage, temperature and fan sensor
+.Nd ASUSTeK AI Booster ACPI ATK0110 voltage, temperature, and fan sensor
 .Sh SYNOPSIS
 .Cd aibs* at acpi?
 .Sh DESCRIPTION

CVS commit: src/sys/dev/ic

[Nicolas Joly]

Module Name:src
Committed By:   njoly
Date:   Tue Feb  9 23:04:15 UTC 2010

Modified Files:
src/sys/dev/ic: nslm7x.c

Log Message:
Kill extra semi-column.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/ic/nslm7x.c

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

Modified files:

Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.52 src/sys/dev/ic/nslm7x.c:1.53
--- src/sys/dev/ic/nslm7x.c:1.52	Tue Feb  9 13:59:01 2010
+++ src/sys/dev/ic/nslm7x.c	Tue Feb  9 23:04:15 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: nslm7x.c,v 1.52 2010/02/09 13:59:01 pgoyette Exp $ */
+/*	$NetBSD: nslm7x.c,v 1.53 2010/02/09 23:04:15 njoly Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nslm7x.c,v 1.52 2010/02/09 13:59:01 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: nslm7x.c,v 1.53 2010/02/09 23:04:15 njoly Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1833,7 +1833,7 @@
 	devid = (*sc-lm_readreg)(sc, LMD_CHIPID);
 	sc-chipid = (*sc-lm_readreg)(sc, WB_BANK0_CHIPID);
 	lm_generic_banksel(sc, banksel);
-	cf_flags = device_cfdata(sc-sc_dev)-cf_flags;;
+	cf_flags = device_cfdata(sc-sc_dev)-cf_flags;
 	DPRINTF((%s: winbond chip id 0x%x\n, __func__, sc-chipid));
 
 	switch(sc-chipid) {

CVS commit: src

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Feb  9 23:05:16 UTC 2010

Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: pfkey.c proposal.h
src/sys/arch/atari/atari: intr.c
src/sys/arch/atari/dev: ite_cc.c ite_et.c
src/sys/arch/sparc64/sparc64: locore.s
src/sys/kern: uipc_usrreq.c
src/usr.bin/xlint/lint1: cgram.y

Log Message:
Fix typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/dist/ipsec-tools/src/racoon/proposal.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/atari/atari/intr.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/atari/dev/ite_cc.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/atari/dev/ite_et.c
cvs rdiff -u -r1.311 -r1.312 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.128 -r1.129 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/xlint/lint1/cgram.y

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

Modified files:

Index: src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.51 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.52
--- src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.51	Thu Sep  3 09:29:07 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/pfkey.c	Tue Feb  9 23:05:16 2010
@@ -1,6 +1,6 @@
-/*	$NetBSD: pfkey.c,v 1.51 2009/09/03 09:29:07 tteras Exp $	*/
+/*	$NetBSD: pfkey.c,v 1.52 2010/02/09 23:05:16 wiz Exp $	*/
 
-/* $Id: pfkey.c,v 1.51 2009/09/03 09:29:07 tteras Exp $ */
+/* $Id: pfkey.c,v 1.52 2010/02/09 23:05:16 wiz Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -3554,7 +3554,7 @@
 #endif
 
 /*
- * send error against acquire message to kenrel.
+ * send error against acquire message to kernel.
  */
 int
 pk_sendeacquire(iph2)

Index: src/crypto/dist/ipsec-tools/src/racoon/proposal.h
diff -u src/crypto/dist/ipsec-tools/src/racoon/proposal.h:1.6 src/crypto/dist/ipsec-tools/src/racoon/proposal.h:1.7
--- src/crypto/dist/ipsec-tools/src/racoon/proposal.h:1.6	Sat Dec  9 05:52:57 2006
+++ src/crypto/dist/ipsec-tools/src/racoon/proposal.h	Tue Feb  9 23:05:16 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: proposal.h,v 1.6 2006/12/09 05:52:57 manu Exp $	*/
+/*	$NetBSD: proposal.h,v 1.7 2010/02/09 23:05:16 wiz Exp $	*/
 
 /* Id: proposal.h,v 1.5 2004/06/11 16:00:17 ludvigm Exp */
 
@@ -88,7 +88,7 @@
 	int reqid_out;			/* request id (outbound) */
 	int reqid_in;			/* request id (inbound) */
 
-	int ok;/* if 1, success to set SA in kenrel */
+	int ok;/* if 1, success to set SA in kernel */
 
 	struct satrns *head;		/* header of transform */
 	struct saproto *next;		/* next protocol */

Index: src/sys/arch/atari/atari/intr.c
diff -u src/sys/arch/atari/atari/intr.c:1.19 src/sys/arch/atari/atari/intr.c:1.20
--- src/sys/arch/atari/atari/intr.c:1.19	Wed Jul  8 12:23:09 2009
+++ src/sys/arch/atari/atari/intr.c	Tue Feb  9 23:05:16 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.19 2009/07/08 12:23:09 tsutsui Exp $	*/
+/*	$NetBSD: intr.c,v 1.20 2010/02/09 23:05:16 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.19 2009/07/08 12:23:09 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.20 2010/02/09 23:05:16 wiz Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -167,7 +167,7 @@
 			/*
 			 * Normally, all settable vectors are already
 			 * re-routed to the intr_glue() function. The
-			 * marvelous exeption to these are the HBL/VBL
+			 * marvelous exception to these are the HBL/VBL
 			 * interrupts. They happen *very* often and
 			 * can't be turned off on the Falcon. So they
 			 * are normally vectored to an 'rte' instruction.

Index: src/sys/arch/atari/dev/ite_cc.c
diff -u src/sys/arch/atari/dev/ite_cc.c:1.34 src/sys/arch/atari/dev/ite_cc.c:1.35
--- src/sys/arch/atari/dev/ite_cc.c:1.34	Sun Jul 19 05:43:22 2009
+++ src/sys/arch/atari/dev/ite_cc.c	Tue Feb  9 23:05:16 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_cc.c,v 1.34 2009/07/19 05:43:22 tsutsui Exp $	*/
+/*	$NetBSD: ite_cc.c,v 1.35 2010/02/09 23:05:16 wiz Exp $	*/
 
 /*
  * Copyright (c) 1996 Leo Weppelman
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ite_cc.c,v 1.34 2009/07/19 05:43:22 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: ite_cc.c,v 1.35 2010/02/09 23:05:16 wiz Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -211,7 +211,7 @@
 	maj = cdevsw_lookup_major(grf_cdevsw);
 
 	/*
-	 * Handle exeption case: early console init
+	 * Handle exception case: early console init
 	 */
 	if(dp == NULL) {
 		congrf.g_unit= cfdata_grf-cf_unit;

Index: src/sys/arch/atari/dev/ite_et.c
diff -u src/sys/arch/atari/dev/ite_et.c:1.27 src/sys/arch/atari/dev/ite_et.c:1.28
--- src/sys/arch/atari/dev/ite_et.c:1.27	Tue Oct 20 19:10:10 2009
+++ src/sys/arch/atari/dev/ite_et.c	Tue Feb  9 23:05:16 

CVS commit: src

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Feb  9 23:07:14 UTC 2010

Modified Files:
src/gnu/dist/groff/doc: groff-1 groff.texinfo
src/sys/arch/m68k/fpsp: sint.sa

Log Message:
Fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/gnu/dist/groff/doc/groff-1
cvs rdiff -u -r1.1.1.4 -r1.2 src/gnu/dist/groff/doc/groff.texinfo
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/m68k/fpsp/sint.sa

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

Modified files:

Index: src/gnu/dist/groff/doc/groff-1
diff -u src/gnu/dist/groff/doc/groff-1:1.1.1.3 src/gnu/dist/groff/doc/groff-1:1.2
--- src/gnu/dist/groff/doc/groff-1:1.1.1.3	Mon Feb  6 18:12:36 2006
+++ src/gnu/dist/groff/doc/groff-1	Tue Feb  9 23:07:13 2010
@@ -7703,7 +7703,7 @@
 
 
 `gtroff' has string variables, which are entirely for user convenience
-(i.e. there are no built-in strings exept `.T', but even this is a
+(i.e. there are no built-in strings except `.T', but even this is a
 read-write string variable).
 
  -- Request: .ds name [string]

Index: src/gnu/dist/groff/doc/groff.texinfo
diff -u src/gnu/dist/groff/doc/groff.texinfo:1.1.1.4 src/gnu/dist/groff/doc/groff.texinfo:1.2
--- src/gnu/dist/groff/doc/groff.texinfo:1.1.1.4	Mon Feb  6 18:12:12 2006
+++ src/gnu/dist/groff/doc/groff.texinfo	Tue Feb  9 23:07:13 2010
@@ -10175,7 +10175,7 @@
 @cindex strings
 
 @code{gtroff} has string variables, which are entirely for user
-convenience (i.e.@: there are no built-in strings exept @code{.T}, but
+convenience (i.e.@: there are no built-in strings except @code{.T}, but
 even this is a read-write string variable).
 
 @DefreqList {ds, name [...@var{string}]}

Index: src/sys/arch/m68k/fpsp/sint.sa
diff -u src/sys/arch/m68k/fpsp/sint.sa:1.2 src/sys/arch/m68k/fpsp/sint.sa:1.3
--- src/sys/arch/m68k/fpsp/sint.sa:1.2	Wed Oct 26 07:49:48 1994
+++ src/sys/arch/m68k/fpsp/sint.sa	Tue Feb  9 23:07:14 2010
@@ -1,4 +1,4 @@
-*	$NetBSD: sint.sa,v 1.2 1994/10/26 07:49:48 cgd Exp $
+*	$NetBSD: sint.sa,v 1.3 2010/02/09 23:07:14 wiz Exp $
 
 *	MOTOROLA MICROPROCESSOR  MEMORY TECHNOLOGY GROUP
 *	M68000 Hi-Performance Microprocessor Division
@@ -148,7 +148,7 @@
 *	Input:	a0 points to an IEEE extended format operand
 * 	Output:	fp0 has the result 
 *
-* Exeptions:
+* Exceptions:
 *
 * If the subroutine results in an inexact operation, the inx2 and
 * ainx bits in the USER_FPSR are set.

CVS commit: src/sys/arch/i386/i386

[Jean-Yves Migeon]

Module Name:src
Committed By:   jym
Date:   Tue Feb  9 23:09:47 UTC 2010

Modified Files:
src/sys/arch/i386/i386: mptramp.S

Log Message:
Use CR0_PE (enable protected mode) instead of hardcoding constant.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/i386/mptramp.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/i386/i386/mptramp.S
diff -u src/sys/arch/i386/i386/mptramp.S:1.19 src/sys/arch/i386/i386/mptramp.S:1.20
--- src/sys/arch/i386/i386/mptramp.S:1.19	Fri Nov 27 03:23:10 2009
+++ src/sys/arch/i386/i386/mptramp.S	Tue Feb  9 23:09:47 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: mptramp.S,v 1.19 2009/11/27 03:23:10 rmind Exp $	*/
+/*	$NetBSD: mptramp.S,v 1.20 2010/02/09 23:09:47 jym Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include machine/asm.h
-__KERNEL_RCSID(0, $NetBSD: mptramp.S,v 1.19 2009/11/27 03:23:10 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: mptramp.S,v 1.20 2010/02/09 23:09:47 jym Exp $);
 	
 #include opt_mpbios.h		/* for MPDEBUG */
 		
@@ -125,8 +125,8 @@
 	movw%ax, %es
 	movw%ax, %ss
 	data32 addr32 lgdt(gdt_desc)  # load flat descriptor table
-	movl%cr0, %eax   # get cr0
-	orl $0x1, %eax  # enable protected mode
+	movl%cr0, %eax  # get cr0
+	orl $CR0_PE, %eax   # enable protected mode
 	movl%eax, %cr0  # doit
 	ljmpl$0x8, $mp_startup
 

CVS commit: src/sys/dev/pci

[Hubert Feyrer]

Module Name:src
Committed By:   hubertf
Date:   Tue Feb  9 23:13:10 UTC 2010

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add entry for Juniper Networks Experimental Clock Version 0
Fixes PR kern/42742


To generate a diff of this commit:
cvs rdiff -u -r1.1021 -r1.1022 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1021 src/sys/dev/pci/pcidevs:1.1022
--- src/sys/dev/pci/pcidevs:1.1021	Tue Feb  9 04:40:21 2010
+++ src/sys/dev/pci/pcidevs	Tue Feb  9 23:13:09 2010
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1021 2010/02/09 04:40:21 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1022 2010/02/09 23:13:09 hubertf Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -538,6 +538,7 @@
 vendor RAINBOW		0x12de	Rainbow Technologies
 vendor DATUM		0x12e2	Datum Inc. Bancomm-Timing Division
 vendor AUREAL		0x12eb	Aureal Semiconductor
+vendor JUNIPER		0x1304	Juniper Networks
 vendor ADMTEK		0x1317	ADMtek
 vendor PACKETENGINES	0x1318	Packet Engines
 vendor FORTEMEDIA	0x1319	Forte Media
@@ -2856,6 +2857,9 @@
 product JNI FCX26562	0x6562	FCX2-6562 Dual Fibre-Channel Adapter
 product JNI FCX6562	0x656a	FCX-6562 Fibre-Channel Adapter
 
+/* Juniper Networks products */
+product JUNIPER XCLK0	0x0030	Experimental Clock Version 0
+
 /* KTI products - XXX better descriptions */
 product KTI NE2KETHER	0x3000	Ethernet
 

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

[Jean-Yves Migeon]

Module Name:src
Committed By:   jym
Date:   Tue Feb  9 23:47:10 UTC 2010

Modified Files:
src/sys/arch/x86/x86: cpu.c

Log Message:
Use roundup2() instead of hardcoding the operation.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/x86/x86/cpu.c

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

Modified files:

Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.66 src/sys/arch/x86/x86/cpu.c:1.67
--- src/sys/arch/x86/x86/cpu.c:1.66	Fri Jan  8 19:43:26 2010
+++ src/sys/arch/x86/x86/cpu.c	Tue Feb  9 23:47:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.66 2010/01/08 19:43:26 dyoung Exp $	*/
+/*	$NetBSD: cpu.c,v 1.67 2010/02/09 23:47:10 jym Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.66 2010/01/08 19:43:26 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.67 2010/02/09 23:47:10 jym Exp $);
 
 #include opt_ddb.h
 #include opt_mpbios.h		/* for MPDEBUG */
@@ -294,8 +294,7 @@
 		aprint_naive(: Application Processor\n);
 		ptr = (uintptr_t)kmem_alloc(sizeof(*ci) + CACHE_LINE_SIZE - 1,
 		KM_SLEEP);
-		ci = (struct cpu_info *)((ptr + CACHE_LINE_SIZE - 1) 
-		~(CACHE_LINE_SIZE - 1));
+		ci = (struct cpu_info *)roundup2(ptr, CACHE_LINE_SIZE);
 		memset(ci, 0, sizeof(*ci));
 		ci-ci_curldt = -1;
 #ifdef TRAPLOG

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

[Jean-Yves Migeon]

Module Name:src
Committed By:   jym
Date:   Tue Feb  9 23:52:14 UTC 2010

Modified Files:
src/sys/arch/x86/x86: cpu.c x86_machdep.c

Log Message:
Wrap a comment; add a space after a comma to another (align with next line)


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/x86/x86_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/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.67 src/sys/arch/x86/x86/cpu.c:1.68
--- src/sys/arch/x86/x86/cpu.c:1.67	Tue Feb  9 23:47:10 2010
+++ src/sys/arch/x86/x86/cpu.c	Tue Feb  9 23:52:13 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.67 2010/02/09 23:47:10 jym Exp $	*/
+/*	$NetBSD: cpu.c,v 1.68 2010/02/09 23:52:13 jym Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.67 2010/02/09 23:47:10 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.68 2010/02/09 23:52:13 jym Exp $);
 
 #include opt_ddb.h
 #include opt_mpbios.h		/* for MPDEBUG */
@@ -606,9 +606,9 @@
 #endif
 	} else {
 		/*
-		 * Synchronize time stamp counters.  Invalidate cache and do twice
-		 * to try and minimize possible cache effects.  Disable interrupts
-		 * to try and rule out any external interference.
+		 * Synchronize time stamp counters. Invalidate cache and do
+		 * twice to try and minimize possible cache effects. Disable
+		 * interrupts to try and rule out any external interference.
 		 */
 		psl = x86_read_psl();
 		x86_disable_intr();

Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.38 src/sys/arch/x86/x86/x86_machdep.c:1.39
--- src/sys/arch/x86/x86/x86_machdep.c:1.38	Sat Jan  9 22:54:00 2010
+++ src/sys/arch/x86/x86/x86_machdep.c	Tue Feb  9 23:52:13 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_machdep.c,v 1.38 2010/01/09 22:54:00 cegger Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.39 2010/02/09 23:52:13 jym Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_machdep.c,v 1.38 2010/01/09 22:54:00 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_machdep.c,v 1.39 2010/02/09 23:52:13 jym Exp $);
 
 #include opt_modular.h
 
@@ -532,7 +532,7 @@
 		 *   Avoid Compatibility Holes.
 		 * XXX  Holes within memory space that allow access
 		 * XXX to be directed to the PC-compatible frame buffer
-		 * XXX (0xa-0xb),to adapter ROM space
+		 * XXX (0xa-0xb), to adapter ROM space
 		 * XXX (0xc-0xd), and to system BIOS space
 		 * XXX (0xe-0xf).
 		 * XXX  Some laptop(for example,Toshiba Satellite2550X)

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

[Jean-Yves Migeon]

Module Name:src
Committed By:   jym
Date:   Wed Feb 10 00:39:31 UTC 2010

Modified Files:
src/sys/arch/x86/x86: pmap.c

Log Message:
To properly account for the total number of pages allocated for PDP, use
PDP_SIZE, as PAE (i386) requires 4 pages instead of 1.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/x86/x86/pmap.c

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

Modified files:

Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.101 src/sys/arch/x86/x86/pmap.c:1.102
--- src/sys/arch/x86/x86/pmap.c:1.101	Tue Feb  9 22:51:14 2010
+++ src/sys/arch/x86/x86/pmap.c	Wed Feb 10 00:39:30 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.101 2010/02/09 22:51:14 jym Exp $	*/
+/*	$NetBSD: pmap.c,v 1.102 2010/02/10 00:39:30 jym Exp $	*/
 
 /*
  * Copyright (c) 2007 Manuel Bouyer.
@@ -149,7 +149,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.101 2010/02/09 22:51:14 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.102 2010/02/10 00:39:30 jym Exp $);
 
 #include opt_user_ldt.h
 #include opt_lockdebug.h
@@ -2217,7 +2217,8 @@
 		pmap-pm_ptphint[i] = NULL;
 	}
 	pmap-pm_stats.wired_count = 0;
-	pmap-pm_stats.resident_count = 1;	/* count the PDP allocd below */
+	/* count the PDP allocd below */
+	pmap-pm_stats.resident_count = PDP_SIZE;
 #if !defined(__x86_64__)
 	pmap-pm_hiexec = 0;
 #endif /* !defined(__x86_64__) */

CVS commit: src/doc

[Constantine A. Murenin]

Module Name:src
Committed By:   cnst
Date:   Wed Feb 10 01:40:25 UTC 2010

Modified Files:
src/doc: CHANGES

Log Message:
mention aibs(4);  suggested: pgoyette;


To generate a diff of this commit:
cvs rdiff -u -r1.1357 -r1.1358 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.1357 src/doc/CHANGES:1.1358
--- src/doc/CHANGES:1.1357	Tue Feb  9 01:48:29 2010
+++ src/doc/CHANGES	Wed Feb 10 01:40:24 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1357 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1358 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -548,3 +548,5 @@
 		kern.mbuf.nmbclusters. [joerg 20100208]
 	mfi(4): Add support for LSI's newer (GEN2) RAID controller from
 		OpenBSD. [msaitoh 20100209]
+	aibs(4): New driver for ASUSTeK AI Booster (ACPI ASOC ATK0110)
+		hardware monitor with limit support.	[cnst 20100209]

CVS commit: src/sys/rump/dev/wip/libumass

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Wed Feb 10 02:08:34 UTC 2010

Modified Files:
src/sys/rump/dev/wip/libumass: sd_at_scsibus_at_umass.c

Log Message:
The first step to having cd work is to remember to attach it and
go devfs on it.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c

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

Modified files:

Index: src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c
diff -u src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c:1.8 src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c:1.9
--- src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c:1.8	Tue Feb  9 19:02:19 2010
+++ src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c	Wed Feb 10 02:08:34 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: sd_at_scsibus_at_umass.c,v 1.8 2010/02/09 19:02:19 pooka Exp $	*/
+/*	$NetBSD: sd_at_scsibus_at_umass.c,v 1.9 2010/02/10 02:08:34 pooka Exp $	*/
 
 #include sys/param.h
 #include sys/conf.h
@@ -24,8 +24,8 @@
 	extern struct cfattach rumpusbhc_ca;
 	extern struct cfattach usb_ca, uhub_ca, uroothub_ca, umass_ca;
 	extern struct cfattach scsibus_ca, atapibus_ca, sd_ca, cd_ca;
-	extern struct bdevsw sd_bdevsw;
-	extern struct cdevsw sd_cdevsw;
+	extern struct bdevsw sd_bdevsw, cd_bdevsw;
+	extern struct cdevsw sd_cdevsw, cd_cdevsw;
 	devmajor_t bmaj, cmaj;
 
 	FLAWLESSCALL(config_cfdata_attach(cfdata_umass, 0));
@@ -66,4 +66,12 @@
 	bmaj, 0, 8));
 	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, /dev/rsd0, 'a',
 	cmaj, 0, 8));
+
+	bmaj = cmaj = -1;
+	FLAWLESSCALL(devsw_attach(cd, cd_bdevsw, bmaj, cd_cdevsw, cmaj));
+
+	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, /dev/cd0, 'a',
+	bmaj, 0, 8));
+	FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, /dev/rcd0, 'a',
+	cmaj, 0, 8));
 }

CVS commit: [uebayasi-xip] src/sys/conf

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Wed Feb 10 02:10:28 UTC 2010

Modified Files:
src/sys/conf [uebayasi-xip]: files

Log Message:
Make device page handling another kernel option.  XIP depends on it.


To generate a diff of this commit:
cvs rdiff -u -r1.974.2.1 -r1.974.2.2 src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.974.2.1 src/sys/conf/files:1.974.2.2
--- src/sys/conf/files:1.974.2.1	Mon Feb  8 05:01:09 2010
+++ src/sys/conf/files	Wed Feb 10 02:10:28 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.974.2.1 2010/02/08 05:01:09 uebayasi Exp $
+#	$NetBSD: files,v 1.974.2.2 2010/02/10 02:10:28 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20090313
@@ -116,8 +116,10 @@
 defflag opt_wapbl.h		WAPBL WAPBL_DEBUG
 defparam opt_wapbl.h		WAPBL_DEBUG_PRINT
 
+defflag opt_device_page.h	DEVICE_PAGE
+
 # eXecute In Place
-defflag opt_xip.h		XIP
+defflag opt_xip.h		XIP: DEVICE_PAGE
 
 # compatibility options
 #

CVS commit: [uebayasi-xip] src/sys/uvm

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Wed Feb 10 02:12:40 UTC 2010

Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c uvm_page.h

Log Message:
Initial MD per-page data (struct vm_page_md) lookup code for XIP'able device
pages.  Compile tested only.

Always define uvm_pageisdevice_p().  Always false if kernel is !DEVICE_PAGE.


To generate a diff of this commit:
cvs rdiff -u -r1.153.2.9 -r1.153.2.10 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.59.2.6 -r1.59.2.7 src/sys/uvm/uvm_page.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/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.9 src/sys/uvm/uvm_page.c:1.153.2.10
--- src/sys/uvm/uvm_page.c:1.153.2.9	Tue Feb  9 14:12:00 2010
+++ src/sys/uvm/uvm_page.c	Wed Feb 10 02:12:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.9 2010/02/09 14:12:00 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.10 2010/02/10 02:12:39 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,11 +71,12 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.9 2010/02/09 14:12:00 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.10 2010/02/10 02:12:39 uebayasi Exp $);
 
 #include opt_ddb.h
 #include opt_uvmhist.h
 #include opt_readahead.h
+#include opt_device_page.h
 #include opt_xip.h
 
 #include sys/param.h
@@ -103,7 +104,7 @@
 
 struct vm_physseg vm_physmem[VM_PHYSSEG_MAX];	/* XXXCDC: uvm.physmem */
 int vm_nphysmem = 0;/* XXXCDC: uvm.nphysmem */
-#ifdef XIP
+#ifdef DEVICE_PAGE
 struct vm_physseg vm_physdev[VM_PHYSSEG_MAX];	/* XXXCDC: uvm.physdev */
 int vm_nphysdev = 0;/* XXXCDC: uvm.nphysdev */
 #endif
@@ -901,7 +902,7 @@
 	pframe, NULL, offp);
 }
 
-#ifdef XIP
+#ifdef DEVICE_PAGE
 int
 vm_physseg_find_device(paddr_t pframe, int *offp)
 {
@@ -1029,12 +1030,22 @@
 }
 
 
+#ifdef DEVICE_PAGE
 /*
- * PHYS_TO_VM_PAGE: find vm_page for a PA.   used by MI code to get vm_pages
- * back from an I/O mapping (ugh!).   used in some MD code as well.
+ * Device pages don't have struct vm_page objects for various reasons:
+ *
+ * - Device pages are volatile; not paging involved.  Which means we have
+ *   much less state information to keep for each page.
+ *
+ * - Volatile, directly memory-mappable devices (framebuffers, audio devices,
+ *   etc.) only need physical address and attribute (protection and some
+ *   accelaration specific to physical bus) common to all the pages.
+ *   Allocating vm_page objects to keep such informations is wasteful.
+ *
+ * - Per-page MD information is only used for XIP vnodes' copy-on-write from
+ *   a device page to anon.
  */
 
-#ifdef XIP
 /* Assume struct vm_page * is aligned to 4 bytes. */
 #define	VM_PAGE_DEVICE_MAGIC		0x2
 #define	VM_PAGE_DEVICE_MAGIC_MASK	0x3
@@ -1064,6 +1075,12 @@
 }
 #endif
 
+
+/*
+ * PHYS_TO_VM_PAGE: find vm_page for a PA.   used by MI code to get vm_pages
+ * back from an I/O mapping (ugh!).   used in some MD code as well.
+ */
+
 struct vm_page *
 uvm_phys_to_vm_page(paddr_t pa)
 {
@@ -1071,7 +1088,7 @@
 	int	off;
 	int	psi;
 
-#ifdef XIP
+#ifdef DEVICE_PAGE
 	psi = vm_physseg_find_device(pf, off);
 	if (psi != -1)
 		return(PHYS_TO_VM_PAGE_DEVICE(pa));
@@ -1088,7 +1105,7 @@
 	const struct vm_physseg *seg;
 	int psi;
 
-#ifdef XIP
+#ifdef DEVICE_PAGE
 	if (uvm_pageisdevice_p(pg)) {
 		return VM_PAGE_DEVICE_TO_PHYS(pg);
 	}
@@ -1099,6 +1116,132 @@
 	return (seg-start + pg - seg-pgs) * PAGE_SIZE;
 }
 
+
+#ifdef XIP
+/*
+ * Device page's mdpage lookup.
+ *
+ * - Hashing code is based on sys/arch/x86/x86/pmap.c.
+ *
+ * - 
+ * XXX Consider to allocate slots on-demand.
+ */
+
+void vm_page_device_mdpage_insert(struct vm_page *);
+void vm_page_device_mdpage_remove(struct vm_page *);
+struct vm_page_md *vm_page_device_mdpage_lookup(struct vm_page *);
+
+struct vm_page_device_mdpage_entry {
+	struct vm_page_md mde_mdpage;
+	SLIST_ENTRY(vm_page_device_mdpage_entry) mde_hash;
+	paddr_t mde_pf;
+};
+
+/*
+ * These can be optimized depending on the size of XIP'ed executables' .data
+ * segments.  If page size is 4K and .data is 1M, .data spans across 256
+ * pages.  Considering these pages' physical addresses are continuous, linear
+ * hash should suffice.
+ */
+#define	MDPG_HASH_SIZE		256	/* XXX */
+#define	MDPG_HASH_LOCK_CNT	4	/* XXX */
+
+struct vm_page_device_mdpage {
+	kmutex_t locks[MDPG_HASH_LOCK_CNT];
+	struct vm_page_device_mdpage_head {
+		SLIST_HEAD(, vm_page_device_mdpage_entry) list;
+	} heads[MDPG_HASH_SIZE];
+};
+
+/* Global for now.  Consider to make this per-vm_physseg. */
+struct vm_page_device_mdpage vm_page_device_mdpage;
+
+static u_int
+vm_page_device_mdpage_hash(struct vm_page *pg)
+{
+
+	return VM_PAGE_DEVICE_TO_PHYS(pg);
+}
+
+static struct vm_page_device_mdpage_head *
+vm_page_device_mdpage_head(u_int hash)
+{
+
+	return vm_page_device_mdpage.heads[hash % MDPG_HASH_SIZE];
+}
+

CVS commit: src/sys/rump/dev/wip

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Wed Feb 10 02:26:24 UTC 2010

Modified Files:
src/sys/rump/dev/wip: Makefile files.rump
src/sys/rump/dev/wip/libucom: ucom_at_usb.c
src/sys/rump/dev/wip/libukbd: ukbd_at_usb.c
src/sys/rump/dev/wip/libulpt: ulpt_at_usb.c
src/sys/rump/dev/wip/libumass: sd_at_scsibus_at_umass.c
src/sys/rump/dev/wip/libums: ums_at_usb.c
src/sys/rump/dev/wip/libusbrum: rum_at_usb.c
src/sys/rump/dev/wip/libwscons: component.c
Added Files:
src/sys/rump/dev/wip/libugenhc: Makefile shlib_version ugenhc.c
Removed Files:
src/sys/rump/dev/wip/librumpusbhc: Makefile rumpusbhc.c shlib_version

Log Message:
Rename rumpusbhc to ugenhc, as that better describes what it does.
(the full component name is rumpdev_ugenhc)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/wip/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/files.rump
cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/wip/librumpusbhc/Makefile
cvs rdiff -u -r1.15 -r0 src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/wip/librumpusbhc/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libucom/ucom_at_usb.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/wip/libugenhc/Makefile \
src/sys/rump/dev/wip/libugenhc/shlib_version \
src/sys/rump/dev/wip/libugenhc/ugenhc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/libulpt/ulpt_at_usb.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/wip/libums/ums_at_usb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/wip/libusbrum/rum_at_usb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/libwscons/component.c

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

Modified files:

Index: src/sys/rump/dev/wip/Makefile
diff -u src/sys/rump/dev/wip/Makefile:1.5 src/sys/rump/dev/wip/Makefile:1.6
--- src/sys/rump/dev/wip/Makefile:1.5	Fri Feb  5 22:01:38 2010
+++ src/sys/rump/dev/wip/Makefile	Wed Feb 10 02:26:23 2010
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.5 2010/02/05 22:01:38 pooka Exp $
+#	$NetBSD: Makefile,v 1.6 2010/02/10 02:26:23 pooka Exp $
 #
 
-SUBDIR=	librumpusbhc libucom libumass libulpt libusb libusbrum
+SUBDIR=	libugenhc libucom libumass libulpt libusb libusbrum
 SUBDIR+=libums libukbd
 
 SUBDIR+=libwscons

Index: src/sys/rump/dev/wip/files.rump
diff -u src/sys/rump/dev/wip/files.rump:1.1 src/sys/rump/dev/wip/files.rump:1.2
--- src/sys/rump/dev/wip/files.rump:1.1	Thu Feb  4 00:37:08 2010
+++ src/sys/rump/dev/wip/files.rump	Wed Feb 10 02:26:23 2010
@@ -1,20 +1,20 @@
-#	$NetBSD: files.rump,v 1.1 2010/02/04 00:37:08 pooka Exp $
+#	$NetBSD: files.rump,v 1.2 2010/02/10 02:26:23 pooka Exp $
 #
 
 device mainbus { }
 attach mainbus at root
-device rumpusbhc: usbus, usbroothub
-attach rumpusbhc at mainbus
+device ugenhc: usbus, usbroothub
+attach ugenhc at mainbus
 
 # ugen0 - ugen3
 mainbus0 at root
-rumpusbhc0 at mainbus0
-rumpusbhc1 at mainbus0
-rumpusbhc2 at mainbus0
-rumpusbhc3 at mainbus0
+ugenhc0 at mainbus0
+ugenhc1 at mainbus0
+ugenhc2 at mainbus0
+ugenhc3 at mainbus0
 
 # USB bus support
-usb*at rumpusbhc?
+usb*at ugenhc?
 
 # USB ROOT Hub
 #

Index: src/sys/rump/dev/wip/libucom/ucom_at_usb.c
diff -u src/sys/rump/dev/wip/libucom/ucom_at_usb.c:1.3 src/sys/rump/dev/wip/libucom/ucom_at_usb.c:1.4
--- src/sys/rump/dev/wip/libucom/ucom_at_usb.c:1.3	Wed Feb  3 21:18:38 2010
+++ src/sys/rump/dev/wip/libucom/ucom_at_usb.c	Wed Feb 10 02:26:23 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ucom_at_usb.c,v 1.3 2010/02/03 21:18:38 pooka Exp $	*/
+/*	$NetBSD: ucom_at_usb.c,v 1.4 2010/02/10 02:26:23 pooka Exp $	*/
 
 #include sys/param.h
 #include sys/types.h
@@ -32,8 +32,8 @@
 	FLAWLESSCALL(config_cfdriver_attach(mainbus_cd));
 	FLAWLESSCALL(config_cfattach_attach(mainbus, mainbus_ca));
 
-	FLAWLESSCALL(config_cfdriver_attach(rumpusbhc_cd));
-	FLAWLESSCALL(config_cfattach_attach(rumpusbhc, rumpusbhc_ca));
+	FLAWLESSCALL(config_cfdriver_attach(ugenhc_cd));
+	FLAWLESSCALL(config_cfattach_attach(ugenhc, ugenhc_ca));
 
 	FLAWLESSCALL(config_cfdriver_attach(usb_cd));
 	FLAWLESSCALL(config_cfattach_attach(usb, usb_ca));

Index: src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c
diff -u src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c:1.2 src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c:1.3
--- src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c:1.2	Wed Feb  3 21:18:38 2010
+++ src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c	Wed Feb 10 02:26:23 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ukbd_at_usb.c,v 1.2 2010/02/03 21:18:38 pooka Exp $	*/
+/*	$NetBSD: ukbd_at_usb.c,v 1.3 2010/02/10 02:26:23 pooka Exp $	*/
 
 #include sys/param.h
 #include sys/conf.h
@@ -28,8 +28,8 @@
 	FLAWLESSCALL(config_cfdriver_attach(mainbus_cd));
 	FLAWLESSCALL(config_cfattach_attach(mainbus, mainbus_ca));
 
-	

CVS commit: src/share/examples/rump

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Wed Feb 10 02:31:01 UTC 2010

Modified Files:
src/share/examples/rump/sdread: Makefile
src/share/examples/rump/tipsy: Makefile
src/share/examples/rump/ukbd_read: Makefile
src/share/examples/rump/ulptprint: Makefile
src/share/examples/rump/ums_draw: Makefile
src/share/examples/rump/umserv: Makefile
src/share/examples/rump/wirelessconf: Makefile

Log Message:
rumpusbhc is now ugenhc


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/examples/rump/sdread/Makefile
cvs rdiff -u -r1.1 -r1.2 src/share/examples/rump/tipsy/Makefile
cvs rdiff -u -r1.1 -r1.2 src/share/examples/rump/ukbd_read/Makefile
cvs rdiff -u -r1.1 -r1.2 src/share/examples/rump/ulptprint/Makefile
cvs rdiff -u -r1.1 -r1.2 src/share/examples/rump/ums_draw/Makefile
cvs rdiff -u -r1.1 -r1.2 src/share/examples/rump/umserv/Makefile
cvs rdiff -u -r1.3 -r1.4 src/share/examples/rump/wirelessconf/Makefile

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

Modified files:

Index: src/share/examples/rump/sdread/Makefile
diff -u src/share/examples/rump/sdread/Makefile:1.3 src/share/examples/rump/sdread/Makefile:1.4
--- src/share/examples/rump/sdread/Makefile:1.3	Wed Oct 14 23:51:52 2009
+++ src/share/examples/rump/sdread/Makefile	Wed Feb 10 02:31:00 2010
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.3 2009/10/14 23:51:52 pooka Exp $
+#	$NetBSD: Makefile,v 1.4 2010/02/10 02:31:00 pooka Exp $
 #
 
 PROG=	sdread
 
 LDADD+=	-lrumpfs_ffs -lrumpfs_msdos -lrumpvfs
-LDADD+=	-lrumpdev_disk -lrumpdev_usb -lrumpdev_usbhc -lrumpdev_umass -lrumpdev
+LDADD+=	-lrumpdev_disk -lrumpdev_usb -lrumpdev_ugenhc -lrumpdev_umass -lrumpdev
 LDADD+=	-lrump
 LDADD+=	-lrumpuser -lpthread
 

Index: src/share/examples/rump/tipsy/Makefile
diff -u src/share/examples/rump/tipsy/Makefile:1.1 src/share/examples/rump/tipsy/Makefile:1.2
--- src/share/examples/rump/tipsy/Makefile:1.1	Sun Dec 20 19:50:29 2009
+++ src/share/examples/rump/tipsy/Makefile	Wed Feb 10 02:31:00 2010
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2009/12/20 19:50:29 pooka Exp $
+#	$NetBSD: Makefile,v 1.2 2010/02/10 02:31:00 pooka Exp $
 #
 
 PROG=	tipsy
 
 LDADD+=	-lrumpvfs
-LDADD+=	-lrumpdev_usb -lrumpdev_usbhc -lrumpdev_ucom -lrumpdev
+LDADD+=	-lrumpdev_usb -lrumpdev_ugenhc -lrumpdev_ucom -lrumpdev
 LDADD+=	-lrump
 LDADD+=	-lrumpuser -lpthread
 

Index: src/share/examples/rump/ukbd_read/Makefile
diff -u src/share/examples/rump/ukbd_read/Makefile:1.1 src/share/examples/rump/ukbd_read/Makefile:1.2
--- src/share/examples/rump/ukbd_read/Makefile:1.1	Mon Jan 11 02:16:51 2010
+++ src/share/examples/rump/ukbd_read/Makefile	Wed Feb 10 02:31:01 2010
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2010/01/11 02:16:51 pooka Exp $
+#	$NetBSD: Makefile,v 1.2 2010/02/10 02:31:01 pooka Exp $
 #
 
 PROG=	kbd
 
-LDADD+=	-lrumpdev_ukbd -lrumpdev_wscons -lrumpdev_usb -lrumpdev_usbhc -lrumpdev
+LDADD+=	-lrumpdev_ukbd -lrumpdev_wscons -lrumpdev_usb -lrumpdev_ugenhc -lrumpdev
 LDADD+=	-lrumpvfs
 LDADD+=	-lrump
 LDADD+=	-lrumpuser -lpthread

Index: src/share/examples/rump/ulptprint/Makefile
diff -u src/share/examples/rump/ulptprint/Makefile:1.1 src/share/examples/rump/ulptprint/Makefile:1.2
--- src/share/examples/rump/ulptprint/Makefile:1.1	Tue Dec 15 16:01:50 2009
+++ src/share/examples/rump/ulptprint/Makefile	Wed Feb 10 02:31:01 2010
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2009/12/15 16:01:50 pooka Exp $
+#	$NetBSD: Makefile,v 1.2 2010/02/10 02:31:01 pooka Exp $
 #
 
 PROG=	ulptprint
 
-LDADD+=	-lrumpvfs -lrumpdev_usb -lrumpdev_usbhc -lrumpdev_ulpt -lrumpdev
+LDADD+=	-lrumpvfs -lrumpdev_usb -lrumpdev_ugenhc -lrumpdev_ulpt -lrumpdev
 LDADD+=	-lrump
 LDADD+=	-lrumpuser -lpthread
 

Index: src/share/examples/rump/ums_draw/Makefile
diff -u src/share/examples/rump/ums_draw/Makefile:1.1 src/share/examples/rump/ums_draw/Makefile:1.2
--- src/share/examples/rump/ums_draw/Makefile:1.1	Mon Jan 11 02:18:45 2010
+++ src/share/examples/rump/ums_draw/Makefile	Wed Feb 10 02:31:01 2010
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2010/01/11 02:18:45 pooka Exp $
+#	$NetBSD: Makefile,v 1.2 2010/02/10 02:31:01 pooka Exp $
 #
 
 PROG=	ms
 
-LDADD+=	-lrumpdev_ums -lrumpdev_wscons -lrumpdev_usb -lrumpdev_usbhc -lrumpdev
+LDADD+=	-lrumpdev_ums -lrumpdev_wscons -lrumpdev_usb -lrumpdev_ugenhc -lrumpdev
 LDADD+=	-lrumpvfs
 LDADD+=	-lrump
 LDADD+=	-lrumpuser -lpthread

Index: src/share/examples/rump/umserv/Makefile
diff -u src/share/examples/rump/umserv/Makefile:1.1 src/share/examples/rump/umserv/Makefile:1.2
--- src/share/examples/rump/umserv/Makefile:1.1	Tue Dec 22 18:36:02 2009
+++ src/share/examples/rump/umserv/Makefile	Wed Feb 10 02:31:01 2010
@@ -1,6 +1,6 @@
 PROG=umserv
 NOMAN=
-LDADD+=-lrumpdev_usbhc -lrumpdev_umass -lrumpdev_usb -lrumpdev_disk -lrumpdev
+LDADD+=-lrumpdev_ugenhc -lrumpdev_umass -lrumpdev_usb -lrumpdev_disk -lrumpdev
 LDADD+=-lrumpvfs
 LDADD+=-lrump 

CVS commit: src/share/man/man8

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Feb 10 03:38:22 UTC 2010

Modified Files:
src/share/man/man8: afterboot.8

Log Message:
Some markup and capitalization nits, from Bug Hunting in PR misc/40062.
While here, give xdm its own subsection instead of awkwardly lumping it
in with the rc.conf section.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/share/man/man8/afterboot.8

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

Modified files:

Index: src/share/man/man8/afterboot.8
diff -u src/share/man/man8/afterboot.8:1.43 src/share/man/man8/afterboot.8:1.44
--- src/share/man/man8/afterboot.8:1.43	Wed Jan 20 22:24:18 2010
+++ src/share/man/man8/afterboot.8	Wed Feb 10 03:38:22 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: afterboot.8,v 1.43 2010/01/20 22:24:18 jmmv Exp $
+.\	$NetBSD: afterboot.8,v 1.44 2010/02/10 03:38:22 snj Exp $
 .\	$OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $
 .\
 .\ Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu
@@ -113,11 +113,12 @@
 .Dq Ic root .
 You can do so on the console, or over the network using
 .Xr ssh 1 .
-If you have enabled the ssh daemon and wish to allow root logins over
-the network, edit the
+If you have enabled the SSH daemon (see
+.Xr sshd 8 )
+and wish to allow root logins over the network, edit the
 .Pa /etc/ssh/sshd_config
 file and set
-.Cm PermitRootLogin
+.Dq PermitRootLogin
 to
 .Dq yes
 (see
@@ -353,16 +354,16 @@
 .Dl net.inet6.ip6.forwarding=1
 .Pp
 As an alternative, compile a new kernel with the
-.Cm GATEWAY
+.Dq GATEWAY
 option.
 Packets are not forwarded by default, due to RFC requirements.
-.Ss Secure Shell (ssh)
+.Ss Secure Shell (SSH)
 By default, all services are disabled in a fresh
 .Nx
-installation, and ssh is no exception.
+installation, and SSH is no exception.
 You may wish to enable it so you can remotely control your system.
 Set
-.Dq Va sshd=yes
+.Dq Va sshd=YES
 in
 .Pa /etc/rc.conf
 and then starting the server with the command
@@ -393,7 +394,9 @@
 .Pp
 If using a caching name server add the line nameserver 127.0.0.1 first.
 To get a local caching name server to run
-you will need to set named=yes in
+you will need to set
+.Dq named=YES
+in
 .Pa /etc/rc.conf
 and create the
 .Pa named.conf
@@ -558,8 +561,8 @@
 .Pa /etc/rc.conf
 contains the following:
 .Pp
-.Dl ntpdate=yes
-.Dl ntpd=yes
+.Dl ntpdate=YES
+.Dl ntpd=YES
 .Pp
 See
 .Xr date 1 ,
@@ -658,16 +661,14 @@
 See
 .Xr rc.conf 5
 for further information.
-.Pp
+.Ss X Display Manager
 If you've installed X, you may want to turn on
 .Xr xdm 1 ,
 the X Display Manager.
-To do this, set the variable
-.Dq xdm
-to yes in
-.Pa /etc/rc.conf ,
-i.e.:
-.Dq xdm=yes
+To do this, set
+.Dq xdm=YES
+in
+.Pa /etc/rc.conf .
 .Ss Printers
 Edit
 .Pa /etc/printcap
@@ -730,7 +731,8 @@
 as needed.
 You will have to make sure
 .Pa /etc/rc.conf
-has dhcpd=yes
+has
+.Dq dhcpd=YES
 or run
 .Xr dhcpd 8
 manually.
@@ -742,15 +744,16 @@
 as needed.
 You will have to turn it on in
 .Pa /etc/rc.conf
-by adding bootparamd=yes.
+by adding
+.Dq bootparamd=YES .
 .Ss NFS server
 If this is an NFS server, make sure
 .Pa /etc/rc.conf
 has:
 .Bd -literal -offset indent
-nfs_server=yes
-mountd=yes
-rpcbind=yes
+nfs_server=YES
+mountd=YES
+rpcbind=YES
 .Ed
 .Pp
 Edit

CVS commit: src/share/man/man8

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Feb 10 07:38:10 UTC 2010

Modified Files:
src/share/man/man8: afterboot.8

Log Message:
Use comma in serialization instead of dot.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/share/man/man8/afterboot.8

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

Modified files:

Index: src/share/man/man8/afterboot.8
diff -u src/share/man/man8/afterboot.8:1.44 src/share/man/man8/afterboot.8:1.45
--- src/share/man/man8/afterboot.8:1.44	Wed Feb 10 03:38:22 2010
+++ src/share/man/man8/afterboot.8	Wed Feb 10 07:38:09 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: afterboot.8,v 1.44 2010/02/10 03:38:22 snj Exp $
+.\	$NetBSD: afterboot.8,v 1.45 2010/02/10 07:38:09 wiz Exp $
 .\	$OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $
 .\
 .\ Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu
@@ -1033,7 +1033,7 @@
 .Xr mrouted 8 ,
 .Xr mtree 8 ,
 .Xr named 8 ,
-.Xr nis 8 .
+.Xr nis 8 ,
 .Xr rbootd 8 ,
 .Xr rc 8 ,
 .Xr rmt 8 ,