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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Jul 13 06:09:18 UTC 2012

Modified Files:
src/sys/arch/evbarm/conf: files.integrator

Log Message:
Remove commented out lines. sys/arch/evbarm/dev/plcom* exists.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/files.integrator

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

Modified files:

Index: src/sys/arch/evbarm/conf/files.integrator
diff -u src/sys/arch/evbarm/conf/files.integrator:1.8 src/sys/arch/evbarm/conf/files.integrator:1.9
--- src/sys/arch/evbarm/conf/files.integrator:1.8	Mon Dec  3 15:33:30 2007
+++ src/sys/arch/evbarm/conf/files.integrator	Fri Jul 13 06:09:18 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: files.integrator,v 1.8 2007/12/03 15:33:30 ad Exp $
+#	$NetBSD: files.integrator,v 1.9 2012/07/13 06:09:18 skrll Exp $
 #
 # ARM, Ltd. Integrator evaluation board configuraiton info
 #
@@ -21,8 +21,6 @@ file	arch/evbarm/ifpga/ifpga_pci.c		ifpg
 # "device" declaration in files.evbarm (because of needs-flag)
 attach	plcom at ifpga with plcom_ifpga
 file	arch/evbarm/ifpga/plcom_ifpga.c		plcom_ifpga
-#file	arch/evbarm/ifpga/pl010_uart_io.c	plcom
-#file	arch/evbarm/ifpga/pl010_uart_io_asm.S	plcom
 
 # Integrator real-time clock
 device plrtc

CVS commit: src/sys/arch/arm/arm32

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Jul 13 06:02:58 UTC 2012

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
Fix a KASSERT. From/OK'ed by matt@


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/sys/arch/arm/arm32/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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.228 src/sys/arch/arm/arm32/pmap.c:1.229
--- src/sys/arch/arm/arm32/pmap.c:1.228	Sun Jan 29 20:16:16 2012
+++ src/sys/arch/arm/arm32/pmap.c	Fri Jul 13 06:02:58 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.228 2012/01/29 20:16:16 he Exp $	*/
+/*	$NetBSD: pmap.c,v 1.229 2012/07/13 06:02:58 skrll Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
 #include 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.228 2012/01/29 20:16:16 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.229 2012/07/13 06:02:58 skrll Exp $");
 
 #ifdef PMAP_DEBUG
 
@@ -3046,7 +3046,7 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_
 		KASSERT(uvm_page_locked_p(pg));
 #endif
 		KASSERT((md->pvh_attrs & PVF_DMOD) == 0 || (md->pvh_attrs & (PVF_DIRTY|PVF_NC)));
-		KASSERT(((md->pvh_attrs & PVF_WRITE) == 0) == (md->urw_mappings + md->krw_mappings == 0));
+		KASSERT(arm_cache_prefer_mask == 0 || ((md->pvh_attrs & PVF_WRITE) == 0) == (md->urw_mappings + md->krw_mappings == 0));
 	}
 #endif
 

CVS commit: src/sys/arch/arm

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri Jul 13 05:23:30 UTC 2012

Modified Files:
src/sys/arch/arm/arm: cpufunc.c
src/sys/arch/arm/conf: files.arm
src/sys/arch/arm/include: armreg.h

Log Message:
Begin support for Cortex A5, A7, A15 and expand A8 and A9 definitions.
Instead of testing all possible CPUids for a cortex, we know what range
a cortex will be so mask out the insignificant parts and do a single test.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/include/armreg.h

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

Modified files:

Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.105 src/sys/arch/arm/arm/cpufunc.c:1.106
--- src/sys/arch/arm/arm/cpufunc.c:1.105	Sun May 20 17:56:30 2012
+++ src/sys/arch/arm/arm/cpufunc.c	Fri Jul 13 05:23:30 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.c,v 1.105 2012/05/20 17:56:30 skrll Exp $	*/
+/*	$NetBSD: cpufunc.c,v 1.106 2012/07/13 05:23:30 matt Exp $	*/
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.105 2012/05/20 17:56:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.106 2012/07/13 05:23:30 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -1851,10 +1851,7 @@ set_cpufuncs(void)
 	}
 #endif /* CPU_XSCALE_IXP425 */
 #if defined(CPU_CORTEX)
-	if (cputype == CPU_ID_CORTEXA8R1 ||
-	cputype == CPU_ID_CORTEXA8R2 ||
-	cputype == CPU_ID_CORTEXA8R3 ||
-	cputype == CPU_ID_CORTEXA9R1) {
+	if (CPU_ID_CORTEX_P(cputype)) {
 		cpufuncs = cortex_cpufuncs;
 		cpu_reset_needs_v4_MMU_disable = 1;	/* V4 or higher */
 		cpu_do_powersave = 1;			/* Enable powersave */

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.103 src/sys/arch/arm/conf/files.arm:1.104
--- src/sys/arch/arm/conf/files.arm:1.103	Sun Dec 11 03:30:23 2011
+++ src/sys/arch/arm/conf/files.arm	Fri Jul 13 05:23:29 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.103 2011/12/11 03:30:23 kiyohara Exp $
+#	$NetBSD: files.arm,v 1.104 2012/07/13 05:23:29 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -16,8 +16,11 @@ defflag	opt_cputypes.h		CPU_ARM6 CPU_ARM
 defflag	opt_cputypes.h		CPU_ARM1136: CPU_ARM11
 defflag	opt_cputypes.h		CPU_ARM1176: CPU_ARM11
 defflag	opt_cputypes.h		CPU_ARM11MPCORE: CPU_ARM11
+defflag	opt_cputypes.h		CPU_CORTEXA5: CPU_CORTEX
+defflag	opt_cputypes.h		CPU_CORTEXA7: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA8: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA9: CPU_CORTEX
+defflag	opt_cputypes.h		CPU_CORTEXA15: CPU_CORTEX
 defflag opt_cputypes.h		FPU_VFP
 
 defparam opt_cpuoptions.h	XSCALE_CCLKCFG

Index: src/sys/arch/arm/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.51 src/sys/arch/arm/include/armreg.h:1.52
--- src/sys/arch/arm/include/armreg.h:1.51	Sun May 20 18:08:05 2012
+++ src/sys/arch/arm/include/armreg.h	Fri Jul 13 05:23:30 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: armreg.h,v 1.51 2012/05/20 18:08:05 skrll Exp $	*/
+/*	$NetBSD: armreg.h,v 1.52 2012/07/13 05:23:30 matt Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -201,10 +201,16 @@
 #define CPU_ID_ARM1136JSR1	0x4117b360
 #define CPU_ID_ARM1156T2S	0x4107b560 /* MPU only */
 #define CPU_ID_ARM1176JZS	0x410fb760
+#define CPU_ID_CORTEXA5R0	0x410fc050
 #define CPU_ID_CORTEXA8R1	0x411fc080
 #define CPU_ID_CORTEXA8R2	0x412fc080
 #define CPU_ID_CORTEXA8R3	0x413fc080
-#define CPU_ID_CORTEXA9R1	0x411fc090
+#define CPU_ID_CORTEXA9R2	0x411fc090
+#define CPU_ID_CORTEXA9R3	0x412fc090
+#define CPU_ID_CORTEXA9R4	0x413fc090
+#define CPU_ID_CORTEXA15R2	0x412fc0f0
+#define CPU_ID_CORTEXA15R3	0x413fc0f0
+#define	CPU_ID_CORTEX_P(n)	((n & 0xff00) == 0x410fc000)
 #define CPU_ID_SA110		0x4401a100
 #define CPU_ID_SA1100		0x4401a110
 #define	CPU_ID_TI925T		0x54029250

CVS commit: src/common/lib/libc/gen

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Fri Jul 13 01:15:27 UTC 2012

Modified Files:
src/common/lib/libc/gen: ptree.c

Log Message:
Don't bother testing 0 length keys since they can only have one possible value.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/gen/ptree.c

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

Modified files:

Index: src/common/lib/libc/gen/ptree.c
diff -u src/common/lib/libc/gen/ptree.c:1.6 src/common/lib/libc/gen/ptree.c:1.7
--- src/common/lib/libc/gen/ptree.c:1.6	Wed Jul 11 00:19:28 2012
+++ src/common/lib/libc/gen/ptree.c	Fri Jul 13 01:15:27 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptree.c,v 1.6 2012/07/11 00:19:28 rmind Exp $	*/
+/*	$NetBSD: ptree.c,v 1.7 2012/07/13 01:15:27 matt Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 #include 
 #include 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ptree.c,v 1.6 2012/07/11 00:19:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptree.c,v 1.7 2012/07/13 01:15:27 matt Exp $");
 #else
 #include 
 #include 
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ptree.c,v 1.
 #else
 #define	KASSERT(e)	do { } while (/*CONSTCOND*/ 0)
 #endif
-__RCSID("$NetBSD: ptree.c,v 1.6 2012/07/11 00:19:28 rmind Exp $");
+__RCSID("$NetBSD: ptree.c,v 1.7 2012/07/13 01:15:27 matt Exp $");
 #endif /* _KERNEL || _STANDALONE */
 
 #ifdef _LIBC
@@ -134,7 +134,7 @@ ptree_testnode(const pt_tree_t *pt, cons
 {
 	const pt_bitlen_t bitlen = PTN_BRANCH_BITLEN(ptn);
 	if (bitlen == 0)
-		return PT_SLOT_ROOT;
+		return PT_SLOT_ROOT;	/* mask or root, doesn't matter */
 	return (*pt->pt_ops->ptto_testnode)(NODETOKEY(pt, target),
 	PTN_BRANCH_BITOFF(ptn), bitlen, pt->pt_context);
 }
@@ -150,6 +150,9 @@ ptree_matchkey(const pt_tree_t *pt, cons
 static inline pt_slot_t
 ptree_testkey(const pt_tree_t *pt, const void *key, const pt_node_t *ptn)
 {
+	const pt_bitlen_t bitlen = PTN_BRANCH_BITLEN(ptn);
+	if (bitlen == 0)
+		return PT_SLOT_ROOT;	/* mask or root, doesn't matter */
 	return (*pt->pt_ops->ptto_testkey)(key, PTN_BRANCH_BITOFF(ptn),
 	PTN_BRANCH_BITLEN(ptn), pt->pt_context);
 }

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 23:07:06 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdhc.c

Log Message:
bus_space_*_stream_N() functions are not universally available.
Provite alternate implementation for when they are unavailable.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.19 src/sys/dev/sdmmc/sdhc.c:1.20
--- src/sys/dev/sdmmc/sdhc.c:1.19	Thu Jul 12 17:27:42 2012
+++ src/sys/dev/sdmmc/sdhc.c	Thu Jul 12 23:07:06 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc.c,v 1.19 2012/07/12 17:27:42 jakllsch Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.20 2012/07/12 23:07:06 jakllsch Exp $	*/
 /*	$OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.19 2012/07/12 17:27:42 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.20 2012/07/12 23:07:06 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -1016,8 +1016,13 @@ sdhc_exec_command(sdmmc_chipset_handle_t
 		int i;
 
 		for (i = 0; i < 4; i++) {
+#ifdef __BUS_SPACE_HAS_STREAM_METHODS
 			*p++ = bus_space_read_stream_4(hp->iot, hp->ioh,
 			SDHC_RESPONSE + i * 4);
+#else
+			*p++ = htole32(bus_space_read_4(hp->iot, hp->ioh,
+			SDHC_RESPONSE + i * 4));
+#endif
 			if (!ISSET(cmd->c_flags, SCF_RSP_136))
 break;
 		}

CVS commit: src/external/bsd/atf/lib/libatf-c++

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jul 12 22:15:29 UTC 2012

Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile

Log Message:
depend on more libraries


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/atf/lib/libatf-c++/Makefile

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

Modified files:

Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.14 src/external/bsd/atf/lib/libatf-c++/Makefile:1.15
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.14	Thu Jul 12 12:15:40 2012
+++ src/external/bsd/atf/lib/libatf-c++/Makefile	Thu Jul 12 18:15:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/07/12 16:15:40 christos Exp $
+# $NetBSD: Makefile,v 1.15 2012/07/12 22:15:29 christos Exp $
 
 NOLINT=		# defined
 
@@ -7,7 +7,10 @@ NOLINT=		# defined
 LIB=		atf-c++
 LIBISCXX=	yes
 
-LIBDPLIBS+= atf-c  ${.CURDIR}/../libatf-c
+LIBDPLIBS+= atf-c	${.CURDIR}/../libatf-c
+LIBDPLIBS+= stdc++	${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
+LIBDPLIBS+= m	${.CURDIR}/../../../../../lib/libm
+
 
 SRCDIR=		${NETBSDSRCDIR}/external/bsd/atf/dist
 .PATH:		${SRCDIR}

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu Jul 12 21:29:51 UTC 2012

Modified Files:
src/sys/arch/evbarm/include: bus_defs.h

Log Message:
Enable bus_stream options.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/include/bus_defs.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/evbarm/include/bus_defs.h
diff -u src/sys/arch/evbarm/include/bus_defs.h:1.1 src/sys/arch/evbarm/include/bus_defs.h:1.2
--- src/sys/arch/evbarm/include/bus_defs.h:1.1	Fri Jul  1 17:09:59 2011
+++ src/sys/arch/evbarm/include/bus_defs.h	Thu Jul 12 21:29:51 2012
@@ -1,3 +1,5 @@
-/*	$NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:59 dyoung Exp $	*/
+/*	$NetBSD: bus_defs.h,v 1.2 2012/07/12 21:29:51 matt Exp $	*/
+
+#define	__BUS_SPACE_HAS_STREAM_METHODS
 
 #include 

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu Jul 12 21:29:04 UTC 2012

Modified Files:
src/sys/arch/arm/include: cdefs.h

Log Message:
Add more arm7 and arm6 variants.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/include/cdefs.h

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

Modified files:

Index: src/sys/arch/arm/include/cdefs.h
diff -u src/sys/arch/arm/include/cdefs.h:1.4 src/sys/arch/arm/include/cdefs.h:1.5
--- src/sys/arch/arm/include/cdefs.h:1.4	Fri Jan 20 14:08:05 2012
+++ src/sys/arch/arm/include/cdefs.h	Thu Jul 12 21:29:04 2012
@@ -1,9 +1,18 @@
-/*	$NetBSD: cdefs.h,v 1.4 2012/01/20 14:08:05 joerg Exp $	*/
+/*	$NetBSD: cdefs.h,v 1.5 2012/07/12 21:29:04 matt Exp $	*/
 
 #ifndef	_MACHINE_CDEFS_H_
 #define	_MACHINE_CDEFS_H_
 
-#if defined (__ARM_ARCH_6__) || defined (__ARM_ARCH_6J__)
+#if defined (__ARM_ARCH_7__) || defined (__ARM_ARCH_7A__) || \
+defined (__ARM_ARCH_7R__) || defined (__ARM_ARCH_7M__) || \
+defined (__ARM_ARCH_7EM__) /* 7R, 7M, 7EM are for non MMU arms */
+#define _ARM_ARCH_7
+#endif
+
+#if defined (_ARM_ARCH_7) || defined (__ARM_ARCH_6__) || \
+defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6K__) || \
+defined (__ARM_ARCH_6Z__) || defined (__ARM_ARCH_6ZK__) || \
+defined (__ARM_ARCH_6T2__) || defined (__ARM_ARCH_6ZM__)
 #define _ARM_ARCH_6
 #endif
 

CVS commit: xsrc/external/mit/xkbdata/dist

[Thomas Klausner]

Module Name:xsrc
Committed By:   wiz
Date:   Thu Jul 12 20:33:25 UTC 2012

Removed Files:
xsrc/external/mit/xkbdata/dist: COPYING ChangeLog INSTALL Makefile.am
Makefile.in aclocal.m4 config.h.in configure configure.ac
install-sh missing mkinstalldirs xkbrules.am
xsrc/external/mit/xkbdata/dist/compat: Makefile.am Makefile.in README
accessx basic complete default iso9995 japan keypad ledcaps lednum
ledscroll misc mousekeys norepeat pc pc98 xfree86 xtest
xsrc/external/mit/xkbdata/dist/geometry: Makefile.am Makefile.in README
amiga ataritt chicony dell everex fujitsu hp keytronic kinesis
macintosh microsoft nec northgate pc sony sun winbook
xsrc/external/mit/xkbdata/dist/geometry/digital: Makefile.am
Makefile.in lk pc unix
xsrc/external/mit/xkbdata/dist/geometry/ibm: Makefile.am Makefile.in
thinkpad
xsrc/external/mit/xkbdata/dist/geometry/sgi: Makefile.am Makefile.in O2
indigo indy
xsrc/external/mit/xkbdata/dist/keycodes: Makefile.am Makefile.in README
aliases amiga ataritt fujitsu hp ibm macintosh powerpcps2 sony sun
xfree86 xfree98
xsrc/external/mit/xkbdata/dist/keycodes/digital: Makefile.am
Makefile.in lk pc
xsrc/external/mit/xkbdata/dist/keycodes/sgi: Makefile.am Makefile.in
indigo indy iris
xsrc/external/mit/xkbdata/dist/keymap: Makefile.am Makefile.in README
amiga ataritt macintosh sony xfree86 xfree98
xsrc/external/mit/xkbdata/dist/keymap/digital: Makefile.am Makefile.in
us
xsrc/external/mit/xkbdata/dist/keymap/sgi: Makefile.am Makefile.in be
bg ca cz cz_qwerty de de_CH dk dvorak en_US es fi fr fr_CH gb hu it
jp no pl pt ru se sk sk_qwerty th us
xsrc/external/mit/xkbdata/dist/keymap/sun: Makefile.am Makefile.in de
es fi fr no pl ru se uk us
xsrc/external/mit/xkbdata/dist/rules: Makefile.am Makefile.in README
sgi sgi.lst sun sun.lst xfree98 xfree98.lst xkb.dtd xml2lst.pl xorg
xorg-it.lst xorg.lst xorg.xml
xsrc/external/mit/xkbdata/dist/semantics: Makefile.am Makefile.in basic
complete default xtest
xsrc/external/mit/xkbdata/dist/symbols: Makefile.am Makefile.in README
al altwin am apple ar az be ben bg br bs by ca ca_enhanced capslock
colemak compose ctrl cz cz_qwerty czsk de de_CH dev dk dvorak ee el
en_US es eurosign fi fo fr fr_CH gb ge_la ge_ru group guj gur hr
hr_US hu hu_US hu_qwerty ie il il_phonetic inet ir is iso9995-3 it
iu jp kan keypad la level3 lo lock lt lt_a lt_p lt_std lv mk ml mm
mn mt mt_us nl no ogham ori pc104 pl pl2 pt ralt ro ro2 ru sapmi se
se_FI se_NO se_SE si sk sk_qwerty sr srvr_ctrl syr syr_phonetic tel
th th_pat th_tis tj tml tr tr_f ua us us_group2 us_group3 us_intl
uz vn yu
xsrc/external/mit/xkbdata/dist/symbols/digital: Makefile.am Makefile.in
lk pc us vt
xsrc/external/mit/xkbdata/dist/symbols/fujitsu: Makefile.am Makefile.in
jp us
xsrc/external/mit/xkbdata/dist/symbols/hp: Makefile.am Makefile.in us
xsrc/external/mit/xkbdata/dist/symbols/macintosh: Makefile.am
Makefile.in de de_CH dk es fi fr fr_CH gb it nl no pt se us
xsrc/external/mit/xkbdata/dist/symbols/nec: Makefile.am Makefile.in jp
xsrc/external/mit/xkbdata/dist/symbols/pc: Makefile.am Makefile.in al
am ara az ba bd be bg br bt by ca ch colemak cz de dk ee es fi fo
fr gb ge gr hr hu ie il in ir is it jp kg la latam latin lk lt lv
mao mkd mm mn mt nl no pc pk pl pt ro ru se si sk srp sy th tj tr
ua us uz vn
xsrc/external/mit/xkbdata/dist/symbols/sgi: Makefile.am Makefile.in jp
xsrc/external/mit/xkbdata/dist/symbols/sony: Makefile.am Makefile.in us
xsrc/external/mit/xkbdata/dist/symbols/sun: Makefile.am Makefile.in se
us usb
xsrc/external/mit/xkbdata/dist/symbols/xfree68: Makefile.am Makefile.in
amiga ataritt
xsrc/external/mit/xkbdata/dist/torture: Makefile.am Makefile.in
indicator indicator1 indicator2 indicator3 mod_compat mod_compat1
mod_compat2 mod_compat3 mod_compat4 sym_interp sym_interp1
sym_interp2 sym_interp3 sym_interp4 types
xsrc/external/mit/xkbdata/dist/types: Makefile.am Makefile.in README
basic cancel caps complete default extra iso9995 mousekeys numpad
pc

Log Message:
Remove dist files for xkbdata, unused since June 2009, when
it was replaced with xkeyboard-config.

Ok mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkbdata/dist/COPYING \
xsrc/external/mit/xkbdata/dist/ChangeLog \
xsrc/external/mit/xkbdata

CVS commit: src/external/mit/xorg/lib/xkbdata

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Jul 12 20:32:34 UTC 2012

Removed Files:
src/external/mit/xorg/lib/xkbdata: Makefile Makefile.xkbdata
src/external/mit/xorg/lib/xkbdata/compat: Makefile
src/external/mit/xorg/lib/xkbdata/geometry: Makefile
src/external/mit/xorg/lib/xkbdata/geometry/digital: Makefile
src/external/mit/xorg/lib/xkbdata/geometry/ibm: Makefile
src/external/mit/xorg/lib/xkbdata/geometry/sgi: Makefile
src/external/mit/xorg/lib/xkbdata/keycodes: Makefile
src/external/mit/xorg/lib/xkbdata/keycodes/digital: Makefile
src/external/mit/xorg/lib/xkbdata/keycodes/sgi: Makefile
src/external/mit/xorg/lib/xkbdata/keymap: Makefile
src/external/mit/xorg/lib/xkbdata/keymap/digital: Makefile
src/external/mit/xorg/lib/xkbdata/keymap/sgi: Makefile
src/external/mit/xorg/lib/xkbdata/keymap/sun: Makefile
src/external/mit/xorg/lib/xkbdata/rules: Makefile
src/external/mit/xorg/lib/xkbdata/semantics: Makefile
src/external/mit/xorg/lib/xkbdata/symbols: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/digital: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/fujitsu: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/hp: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/macintosh: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/nec: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/pc: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/sgi: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/sony: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/sun: Makefile
src/external/mit/xorg/lib/xkbdata/symbols/xfree68: Makefile
src/external/mit/xorg/lib/xkbdata/torture: Makefile
src/external/mit/xorg/lib/xkbdata/types: Makefile

Log Message:
Remove reachover files for xkbdata, unused since June 2009, when
it was replaced with xkeyboard-config.

Ok mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/lib/xkbdata/Makefile \
src/external/mit/xorg/lib/xkbdata/Makefile.xkbdata
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/lib/xkbdata/compat/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/geometry/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/geometry/digital/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/geometry/ibm/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/geometry/sgi/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/keycodes/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/keycodes/digital/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/keycodes/sgi/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/lib/xkbdata/keymap/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/keymap/digital/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/keymap/sgi/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/keymap/sun/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/lib/xkbdata/rules/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/semantics/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/xkbdata/symbols/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/symbols/digital/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/symbols/fujitsu/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/symbols/hp/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/symbols/macintosh/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/symbols/nec/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/xkbdata/symbols/pc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/symbols/sgi/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/symbols/sony/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/symbols/sun/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/xkbdata/symbols/xfree68/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/lib/xkbdata/torture/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/lib/xkbdata/types/Makefile

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

CVS commit: src/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jul 12 20:14:44 UTC 2012

Modified Files:
src/lib: Makefile

Log Message:
don't mention the indirect libm dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/lib/Makefile

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

Modified files:

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.185 src/lib/Makefile:1.186
--- src/lib/Makefile:1.185	Thu Jul 12 15:11:06 2012
+++ src/lib/Makefile	Thu Jul 12 16:14:44 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.185 2012/07/12 19:11:06 christos Exp $
+#	$NetBSD: Makefile,v 1.186 2012/07/12 20:14:44 christos Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include 
@@ -141,7 +141,7 @@ SUBDIR+=	../external/gpl3/gcc/lib/libsup
 SUBDIR+=	.WAIT
 
 .if (${MKATF} != "no")
-SUBDIR+=	../external/bsd/atf/lib	# depends on libstdc++ and libm
+SUBDIR+=	../external/bsd/atf/lib		# depends on libstdc++
 .endif
 
 SUBDIR+=	libform		# depends on libcurses

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 19:43:15 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 415.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.154 -r1.1.2.155 src/doc/CHANGES-6.0

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-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.154 src/doc/CHANGES-6.0:1.1.2.155
--- src/doc/CHANGES-6.0:1.1.2.154	Thu Jul 12 19:26:01 2012
+++ src/doc/CHANGES-6.0	Thu Jul 12 19:43:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.154 2012/07/12 19:26:01 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.155 2012/07/12 19:43:15 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -6310,3 +6310,8 @@ external/historical/nawk/dist/run.c		pat
 	Fix segfault in awk, and address PR#46155.
 	[christos, ticket #414]
 
+xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c 1.4
+
+	Fix colors on suncg6.
+	[macallan, ticket #415]
+

CVS commit: [netbsd-6] xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[Jeff Rizzo]

Module Name:xsrc
Committed By:   riz
Date:   Thu Jul 12 19:42:40 UTC 2012

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common [netbsd-6]:
xf86sbusBus.c

Log Message:
Pull up following revision(s) (requested by macallan in ticket #415):
external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c: revision 
1.4
when using dixSetPrivate() and friends it helps to initialize the key before
using it. Now colours on suncg6 look right again and we don't spin or crash
on exit anymore.
probably needs to be pulled into -6


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.3.2.1
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.3	Tue Aug  2 07:15:03 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c	Thu Jul 12 19:42:40 2012
@@ -585,7 +585,7 @@ xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn
 pScrn->virtualY = psdp->height;
 }
 
-static DevPrivateKeyRec sbusPaletteKeyIndex;
+static DevPrivateKeyRec sbusPaletteKeyIndex = { .initialized = 0 };
 static DevPrivateKey sbusPaletteKey = &sbusPaletteKeyIndex;
 typedef struct _sbusCmap {
 sbusDevicePtr psdp;
@@ -603,7 +603,7 @@ static void
 xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
 			LOCO *colors, VisualPtr pVisual)
 {
-int i, index;
+int i, index, ret;
 sbusCmapPtr cmap;
 struct fbcmap fbcmap;
 unsigned char *data = malloc(numColors*3);
@@ -618,7 +618,10 @@ xf86SbusCmapLoadPalette(ScrnInfoPtr pScr
 for (i = 0; i < numColors; i++) {
 	index = indices[i];
 	if (fbcmap.count && index != fbcmap.index + fbcmap.count) {
-	ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+	ret = ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+	if (ret != 0)
+	xf86Msg(X_ERROR, "%s: ioctl(%d, FBIOPUTCMAP): %d %d\n",
+		  __func__, cmap->psdp->fd, ret, errno);
 	fbcmap.count = 0;
 	fbcmap.index = index;
 	}
@@ -626,7 +629,10 @@ xf86SbusCmapLoadPalette(ScrnInfoPtr pScr
 	fbcmap.green[fbcmap.count] = colors[index].green;
 	fbcmap.blue[fbcmap.count++] = colors[index].blue;
 }
-ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+ret = ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+if (ret != 0)
+xf86Msg(X_ERROR, "%s: ioctl(%d, FBIOPUTCMAP): %d %d\n", __func__,
+  cmap->psdp->fd, ret, errno);
 free(data);
 }
 
@@ -655,9 +661,13 @@ xf86SbusHandleColormaps(ScreenPtr pScree
 {
 sbusCmapPtr cmap;
 struct fbcmap fbcmap;
+int ret;
 unsigned char data[2];
 
 cmap = xnfcalloc(1, sizeof(sbusCmapRec));
+if (!dixPrivateKeyRegistered(sbusPaletteKey)) {
+dixRegisterPrivateKey(sbusPaletteKey, PRIVATE_SCREEN, 0);
+}
 dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap);
 cmap->psdp = psdp;
 fbcmap.index = 0;
@@ -665,7 +675,7 @@ xf86SbusHandleColormaps(ScreenPtr pScree
 fbcmap.red = cmap->origRed;
 fbcmap.green = cmap->origGreen;
 fbcmap.blue = cmap->origBlue;
-if (ioctl (psdp->fd, FBIOGETCMAP, &fbcmap) >= 0)
+if ((ret = ioctl (psdp->fd, FBIOGETCMAP, &fbcmap)) >= 0)
 	cmap->origCmapValid = TRUE;
 fbcmap.index = 0;
 fbcmap.count = 2;
@@ -679,7 +689,10 @@ xf86SbusHandleColormaps(ScreenPtr pScree
 	data[0] = 0;
 	data[1] = 255;
 }
-ioctl (psdp->fd, FBIOPUTCMAP, &fbcmap);
+ret = ioctl (psdp->fd, FBIOPUTCMAP, &fbcmap);
+if (ret != 0) 
+xf86Msg(X_ERROR, "%s: ioctl(%d, FBIOPUTCMAP): %d %d\n", __func__,
+	  psdp->fd, ret, errno);
 cmap->CloseScreen = pScreen->CloseScreen;
 pScreen->CloseScreen = xf86SbusCmapCloseScreen;
 return xf86HandleColormaps(pScreen, 256, 8,

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 19:26:02 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 414.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.153 -r1.1.2.154 src/doc/CHANGES-6.0

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-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.153 src/doc/CHANGES-6.0:1.1.2.154
--- src/doc/CHANGES-6.0:1.1.2.153	Thu Jul 12 19:13:41 2012
+++ src/doc/CHANGES-6.0	Thu Jul 12 19:26:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.153 2012/07/12 19:13:41 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.154 2012/07/12 19:26:01 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -6301,3 +6301,12 @@ sys/sys/ptree.h	1.6
 	Add a context argument to ptree_init().
 	[rmind, ticket #413]
 
+external/historical/nawk/dist/main.c		patch
+external/historical/nawk/dist/b.c		patch
+external/historical/nawk/dist/lib.c		patch
+external/historical/nawk/dist/proto.h		patch
+external/historical/nawk/dist/run.c		patch
+
+	Fix segfault in awk, and address PR#46155.
+	[christos, ticket #414]
+

CVS commit: [netbsd-6] src/external/historical/nawk/dist

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 19:24:21 UTC 2012

Modified Files:
src/external/historical/nawk/dist [netbsd-6]: b.c lib.c main.c proto.h
run.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #414):

external/historical/nawk/dist/main.cpatch
external/historical/nawk/dist/b.c   patch
external/historical/nawk/dist/lib.c patch
external/historical/nawk/dist/proto.h   patch
external/historical/nawk/dist/run.c patch

Fix segfault in awk, and address PR#46155.
[christos, ticket #414]


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/external/historical/nawk/dist/b.c
cvs rdiff -u -r1.4 -r1.4.6.1 src/external/historical/nawk/dist/lib.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/external/historical/nawk/dist/main.c
cvs rdiff -u -r1.5 -r1.5.4.1 src/external/historical/nawk/dist/proto.h
cvs rdiff -u -r1.4 -r1.4.2.1 src/external/historical/nawk/dist/run.c

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

Modified files:

Index: src/external/historical/nawk/dist/b.c
diff -u src/external/historical/nawk/dist/b.c:1.2 src/external/historical/nawk/dist/b.c:1.2.8.1
--- src/external/historical/nawk/dist/b.c:1.2	Thu Aug 26 14:55:19 2010
+++ src/external/historical/nawk/dist/b.c	Thu Jul 12 19:24:21 2012
@@ -624,6 +624,96 @@ int nematch(fa *f, const char *p0)	/* no
 	return (0);
 }
 
+
+/*
+ * NAME
+ * fnematch
+ *
+ * DESCRIPTION
+ * A stream-fed version of nematch which transfers characters to a
+ * null-terminated buffer. All characters up to and including the last
+ * character of the matching text or EOF are placed in the buffer. If
+ * a match is found, patbeg and patlen are set appropriately.
+ *
+ * RETURN VALUES
+ * 0No match found.
+ * 1Match found.
+ */  
+
+int fnematch(fa *pfa, FILE *f, uschar **pbuf, int *pbufsize, int quantum)	
+{
+	uschar *buf = *pbuf;
+	int bufsize = *pbufsize;
+	int c, i, j, k, ns, s;
+
+	s = pfa->initstat;
+	assert(s < pfa->state_count);
+	patlen = 0;
+
+	/*
+	 * All indices relative to buf.
+	 * i <= j <= k <= bufsize
+	 *
+	 * i: origin of active substring
+	 * j: current character
+	 * k: destination of next getc()
+	 */
+	i = -1, k = 0;
+do {
+		j = i++;
+		do {
+			if (++j == k) {
+if (k == bufsize)
+	if (!adjbuf(&buf, &bufsize, bufsize+1, quantum, 0, "fnematch"))
+		FATAL("stream '%.30s...' too long", buf);	
+buf[k++] = (c = getc(f)) != EOF ? c : 0;
+			}
+			c = buf[j];
+			/* assert(c < NCHARS); */
+
+			if ((ns = pfa->gototab[s][c]) != 0)
+s = ns;
+			else
+s = cgoto(pfa, s, c);
+			assert(s < pfa->state_count);
+
+			if (pfa->out[s]) {	/* final state */
+patlen = j - i + 1;
+if (c == 0)	/* don't count $ */
+	patlen--;
+			}
+		} while (buf[j] && s != 1);
+		s = 2;
+	} while (buf[i] && !patlen);
+
+	/* adjbuf() may have relocated a resized buffer. Inform the world. */
+	*pbuf = buf;
+	*pbufsize = bufsize;
+
+	if (patlen) {
+		patbeg = buf + i;
+		/*
+		 * Under no circumstances is the last character fed to
+		 * the automaton part of the match. It is EOF's nullbyte,
+		 * or it sent the automaton into a state with no further
+		 * transitions available (s==1), or both. Room for a
+		 * terminating nullbyte is guaranteed.
+		 *
+		 * ungetc any chars after the end of matching text
+		 * (except for EOF's nullbyte, if present) and null
+		 * terminate the buffer.
+		 */
+		do
+			if (buf[--k] && ungetc(buf[k], f) == EOF)
+FATAL("unable to ungetc '%c'", buf[k]);	
+		while (k > i + patlen);
+		buf[k] = 0;
+		return 1;
+	}
+	else
+		return 0;
+}
+
 Node *reparse(const char *p)	/* parses regular expression pointed to by p */
 {			/* uses relex() to scan regular expression */
 	Node *np;

Index: src/external/historical/nawk/dist/lib.c
diff -u src/external/historical/nawk/dist/lib.c:1.4 src/external/historical/nawk/dist/lib.c:1.4.6.1
--- src/external/historical/nawk/dist/lib.c:1.4	Thu Jan 20 21:23:11 2011
+++ src/external/historical/nawk/dist/lib.c	Thu Jul 12 19:24:21 2012
@@ -38,6 +38,7 @@ THIS SOFTWARE.
 
 char	EMPTY[] = { '\0' };
 FILE	*infile	= NULL;
+int	innew;		/* 1 = infile has not been read by readrec */
 char	*file	= EMPTY;
 uschar	*record;
 int	recsize	= RECSIZE;
@@ -104,6 +105,7 @@ void initgetrec(void)
 		argno++;
 	}
 	infile = stdin;		/* no filenames, so use stdin */
+	innew = 1;
 }
 
 static int firsttime = 1;
@@ -146,9 +148,12 @@ int getrec(uschar **pbuf, int *pbufsize,
 infile = stdin;
 			else if ((infile = fopen(file, "r")) == NULL)
 FATAL("can't open file %s", file);
+			innew = 1;
 			setfval(fnrloc, 0.0);
 		}
-		c = readrec(&buf, &bufsize, infile);
+		c = readrec(&buf, &bufsize, infile, innew);
+		if (innew)
+			innew = 0;
 		if (c != 0 || buf[0] != '\0') {	/* normal record */
 			if (isrecord) {
 if (freeable(fldtab[0]))
@@ -186,9 +191,9 @@ void next

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 19:13:42 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Tickets 407-413.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.152 -r1.1.2.153 src/doc/CHANGES-6.0

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-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.152 src/doc/CHANGES-6.0:1.1.2.153
--- src/doc/CHANGES-6.0:1.1.2.152	Fri Jul  6 13:07:25 2012
+++ src/doc/CHANGES-6.0	Thu Jul 12 19:13:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.152 2012/07/06 13:07:25 jdc Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.153 2012/07/12 19:13:41 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -6262,3 +6262,42 @@ sys/arch/mips/mips/pmap_segtab.c		1.5
 	Change MIPS segtab management to look more like the common pmap.
 	[matt, ticket #406]
 
+sys/arch/vax/include/cpu.h			1.94
+
+	Allow simh to detect the VAX idle loop.
+	[abs, ticket #407]
+
+sys/kern/uipc_socket.c1.211
+
+	Fix a crash that can happen transferring large blocks over a
+	network.  PR#43240.
+	[chs, ticket #408]
+
+sys/arch/powerpc/booke/e500_intr.c		1.18
+
+	Handle a watchdog timeout properly for PPC BookE e500.
+	[matt, ticket #409]
+
+sys/dev/mscp/mscp.c1.35
+sys/dev/mscp/mscp.h1.9
+sys/dev/mscp/mscp_subr.c			1.43
+
+	Fix MSCP handling to work on real hardware.
+	[abs, ticket #410]
+
+gnu/dist/gcc4/gcc/config/vax/builtins.md	1.3
+
+	Fix a vax bug in builtin FFS.  PR#46677.
+	[ragge, ticket #411]
+
+sys/dev/mscp/mscp_disk.c			1.75
+
+	Avoid a warning, to fix vax build.
+	[abs, ticket #412]
+
+common/lib/libc/gen/ptree.c			1.6
+sys/sys/ptree.h	1.6
+
+	Add a context argument to ptree_init().
+	[rmind, ticket #413]
+

CVS commit: src/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jul 12 19:11:07 UTC 2012

Modified Files:
src/lib: Makefile

Log Message:
move atf down to fix the build


To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/lib/Makefile

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

Modified files:

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.184 src/lib/Makefile:1.185
--- src/lib/Makefile:1.184	Sat May 26 22:19:50 2012
+++ src/lib/Makefile	Thu Jul 12 15:11:06 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.184 2012/05/27 02:19:50 matt Exp $
+#	$NetBSD: Makefile,v 1.185 2012/07/12 19:11:06 christos Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include 
@@ -53,10 +53,6 @@ SUBDIR+=	../external/apache2/mDNSRespond
 
 SUBDIR+=	../external/bsd/am-utils/lib
 
-.if (${MKATF} != "no")
-SUBDIR+=	../external/bsd/atf/lib
-.endif
-
 SUBDIR+=	../external/bsd/flex/lib
 SUBDIR+=	../external/bsd/tre/lib
 SUBDIR+=	../external/bsd/libdwarf/lib
@@ -144,6 +140,10 @@ SUBDIR+=	../external/gpl3/gcc/lib/libsup
 # 2nd library dependency barrier 
 SUBDIR+=	.WAIT
 
+.if (${MKATF} != "no")
+SUBDIR+=	../external/bsd/atf/lib	# depends on libstdc++ and libm
+.endif
+
 SUBDIR+=	libform		# depends on libcurses
 SUBDIR+=	libmenu		# depends on libcurses
 SUBDIR+=	libradius	# depends on libcrypto if (${MKCRYPTO} != "no")

CVS commit: src/lib/libedit

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jul 12 18:46:20 UTC 2012

Modified Files:
src/lib/libedit: readline.c

Log Message:
PR/46678: Ian Wienand: Add stub implementation for rl_free_line_state()


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/lib/libedit/readline.c

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

Modified files:

Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.104 src/lib/libedit/readline.c:1.105
--- src/lib/libedit/readline.c:1.104	Mon Jun  4 20:30:22 2012
+++ src/lib/libedit/readline.c	Thu Jul 12 14:46:20 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: readline.c,v 1.104 2012/06/05 00:30:22 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.105 2012/07/12 18:46:20 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.104 2012/06/05 00:30:22 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.105 2012/07/12 18:46:20 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -2267,3 +2267,8 @@ rl_on_new_line(void)
 {
 	return 0;
 }
+
+void
+rl_free_line_state(void)
+{
+}

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jul 12 18:44:49 UTC 2012

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: idea.inc mdc2.inc

Log Message:
oops, add all the files


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc

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

Modified files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc:1.2	Wed Jul 11 14:48:27 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc	Thu Jul 12 14:44:49 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: idea.inc,v 1.2 2012/07/11 18:48:27 christos Exp $
+#	$NetBSD: idea.inc,v 1.3 2012/07/12 18:44:49 christos Exp $
 #
 #	@(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -11,7 +11,7 @@
 IDEA_SRCS = i_cfb64.c i_ofb64.c i_ecb.c
 # IDEA is a patented algorithm; abort().
 # see ../libcrypto_idea
-SRCS+=i_cbc.c i_skey.c
+SRCS+=${IDEA_SRCS} i_cbc.c i_skey.c
 
 .for cryptosrc in ${IDEA_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/idea
Index: src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc:1.2	Wed Jul 11 14:48:27 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc	Thu Jul 12 14:44:49 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: mdc2.inc,v 1.2 2012/07/11 18:48:27 christos Exp $
+#	$NetBSD: mdc2.inc,v 1.3 2012/07/12 18:44:49 christos Exp $
 #
 #	@(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -11,7 +11,7 @@
 MDC2_SRCS = mdc2_one.c
 # MDC2 is a patented algorithm; abort().
 # see ../libcrypto_mdc2
-SRCS+=	mdc2dgst.c
+SRCS+=	${MDC2_SRCS} mdc2dgst.c
 
 .for cryptosrc in ${MDC2_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/mdc2

CVS commit: [netbsd-6] src

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 18:35:10 UTC 2012

Modified Files:
src/common/lib/libc/gen [netbsd-6]: ptree.c
src/sys/sys [netbsd-6]: ptree.h

Log Message:
Pull up following revision(s) (requested by rmind in ticket #413):
common/lib/libc/gen/ptree.c: revision 1.6
sys/sys/ptree.h: revision 1.6
ptree: add context argument.  OK matt@


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/common/lib/libc/gen/ptree.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/sys/ptree.h

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

Modified files:

Index: src/common/lib/libc/gen/ptree.c
diff -u src/common/lib/libc/gen/ptree.c:1.5 src/common/lib/libc/gen/ptree.c:1.5.8.1
--- src/common/lib/libc/gen/ptree.c:1.5	Sun Jun  7 03:12:40 2009
+++ src/common/lib/libc/gen/ptree.c	Thu Jul 12 18:35:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ptree.c,v 1.5 2009/06/07 03:12:40 yamt Exp $ */
+/*	$NetBSD: ptree.c,v 1.5.8.1 2012/07/12 18:35:10 riz Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 #include 
 #include 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ptree.c,v 1.5 2009/06/07 03:12:40 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptree.c,v 1.5.8.1 2012/07/12 18:35:10 riz Exp $");
 #else
 #include 
 #include 
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ptree.c,v 1.
 #else
 #define	KASSERT(e)	do { } while (/*CONSTCOND*/ 0)
 #endif
-__RCSID("$NetBSD: ptree.c,v 1.5 2009/06/07 03:12:40 yamt Exp $");
+__RCSID("$NetBSD: ptree.c,v 1.5.8.1 2012/07/12 18:35:10 riz Exp $");
 #endif /* _KERNEL || _STANDALONE */
 
 #ifdef _LIBC
@@ -124,8 +124,8 @@ ptree_matchnode(const pt_tree_t *pt, con
 	pt_bitoff_t *bitoff_p, pt_slot_t *slots_p)
 {
 	return (*pt->pt_ops->ptto_matchnode)(NODETOKEY(pt, target),
-	(ptn != NULL ? NODETOKEY(pt, ptn) : NULL), max_bitoff,
-	bitoff_p, slots_p);
+	(ptn != NULL ? NODETOKEY(pt, ptn) : NULL),
+	max_bitoff, bitoff_p, slots_p, pt->pt_context);
 }
 
 static inline pt_slot_t
@@ -136,8 +136,7 @@ ptree_testnode(const pt_tree_t *pt, cons
 	if (bitlen == 0)
 		return PT_SLOT_ROOT;
 	return (*pt->pt_ops->ptto_testnode)(NODETOKEY(pt, target),
-	 PTN_BRANCH_BITOFF(ptn),
-	 bitlen);
+	PTN_BRANCH_BITOFF(ptn), bitlen, pt->pt_context);
 }
 
 static inline bool
@@ -145,15 +144,14 @@ ptree_matchkey(const pt_tree_t *pt, cons
 	const pt_node_t *ptn, pt_bitoff_t bitoff, pt_bitlen_t bitlen)
 {
 	return (*pt->pt_ops->ptto_matchkey)(key, NODETOKEY(pt, ptn),
-	bitoff, bitlen);
+	bitoff, bitlen, pt->pt_context);
 }
 
 static inline pt_slot_t
 ptree_testkey(const pt_tree_t *pt, const void *key, const pt_node_t *ptn)
 {
-	return (*pt->pt_ops->ptto_testkey)(key,
-	PTN_BRANCH_BITOFF(ptn),
-	PTN_BRANCH_BITLEN(ptn));
+	return (*pt->pt_ops->ptto_testkey)(key, PTN_BRANCH_BITOFF(ptn),
+	PTN_BRANCH_BITLEN(ptn), pt->pt_context);
 }
 
 static inline void
@@ -166,12 +164,13 @@ ptree_set_position(uintptr_t node, pt_sl
 }
 
 void
-ptree_init(pt_tree_t *pt, const pt_tree_ops_t *ops, size_t node_offset,
-	size_t key_offset)
+ptree_init(pt_tree_t *pt, const pt_tree_ops_t *ops, void *context,
+	size_t node_offset, size_t key_offset)
 {
 	memset(pt, 0, sizeof(*pt));
 	pt->pt_node_offset = node_offset;
 	pt->pt_key_offset = key_offset;
+	pt->pt_context = context;
 	pt->pt_ops = ops;
 }
 

Index: src/sys/sys/ptree.h
diff -u src/sys/sys/ptree.h:1.4 src/sys/sys/ptree.h:1.4.8.1
--- src/sys/sys/ptree.h:1.4	Sat Jul 30 16:37:05 2011
+++ src/sys/sys/ptree.h	Thu Jul 12 18:35:10 2012
@@ -1,4 +1,5 @@
-/* $NetBSD: ptree.h,v 1.4 2011/07/30 16:37:05 christos Exp $ */
+/*	$NetBSD: ptree.h,v 1.4.8.1 2012/07/12 18:35:10 riz Exp $	*/
+
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -27,6 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifndef _SYS_PTREE_H_
 #define _SYS_PTREE_H_
 
@@ -155,12 +157,14 @@ typedef struct pt_node {
 #endif /* _PT_PRIVATE */
 
 typedef struct pt_tree_ops {
-	bool (*ptto_matchnode)(const void *, const void *, pt_bitoff_t,
-		pt_bitoff_t *, pt_slot_t *);
-	bool (*ptto_matchkey)(const void *, const void *, pt_bitoff_t,
-		pt_bitlen_t);
-	pt_slot_t (*ptto_testnode)(const void *, pt_bitoff_t, pt_bitlen_t);
-	pt_slot_t (*ptto_testkey)(const void *, pt_bitoff_t, pt_bitlen_t);
+	bool (*ptto_matchnode)(const void *, const void *,
+		pt_bitoff_t, pt_bitoff_t *, pt_slot_t *, void *);
+	bool (*ptto_matchkey)(const void *, const void *,
+		pt_bitoff_t, pt_bitlen_t, void *);
+	pt_slot_t (*ptto_testnode)(const void *,
+		pt_bitoff_t, pt_bitlen_t, void *);
+	pt_slot_t (*ptto_testkey)(const void *,
+		pt_bitoff_t, pt_bitlen_t, void *);
 } pt_tree_ops_t;
 
 typedef struct pt_tree {
@@ -170,13 +174,14 @@ typedef struct pt_tree {
 	const pt_tree_ops_t *pt_ops;
 	size_t pt_node_offset;
 	size_t pt_key_offset;
-	uintptr_t pt_spare[4];
+	void *pt_context;

CVS commit: [netbsd-6] src/sys/dev/mscp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 18:32:05 UTC 2012

Modified Files:
src/sys/dev/mscp [netbsd-6]: mscp_disk.c

Log Message:
Pull up following revision(s) (requested by abs in ticket #412):
sys/dev/mscp/mscp_disk.c: revision 1.75
- Unconditionally initialise tp to avoid a warning
- Use DK_CLOSED rather than CLOSED (no functional change)


To generate a diff of this commit:
cvs rdiff -u -r1.71.18.1 -r1.71.18.2 src/sys/dev/mscp/mscp_disk.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/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.71.18.1 src/sys/dev/mscp/mscp_disk.c:1.71.18.2
--- src/sys/dev/mscp/mscp_disk.c:1.71.18.1	Wed Jul  4 20:41:46 2012
+++ src/sys/dev/mscp/mscp_disk.c	Thu Jul 12 18:32:05 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mscp_disk.c,v 1.71.18.1 2012/07/04 20:41:46 jdc Exp $	*/
+/*	$NetBSD: mscp_disk.c,v 1.71.18.2 2012/07/12 18:32:05 riz Exp $	*/
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -82,7 +82,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.71.18.1 2012/07/04 20:41:46 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.71.18.2 2012/07/12 18:32:05 riz Exp $");
 
 #include 
 #include 
@@ -305,7 +305,7 @@ raclose(dev_t dev, int flags, int fmt, s
 			(void) tsleep(&udautab[unit], PZERO - 1,
 			"raclose", 0);
 		splx(s);
-		ra->ra_state = CLOSED;
+		ra->ra_state = DK_CLOSED;
 		ra->ra_wlabel = 0;
 	}
 #endif
@@ -461,9 +461,8 @@ raioctl(dev_t dev, u_long cmd, void *dat
 		if (cmd == ODIOCGDEFLABEL)
 			tp = &newlabel;
 		else
-#else
-		tp = (struct disklabel *)data;
 #endif
+		tp = (struct disklabel *)data;
 		memset(tp, 0, sizeof(struct disklabel));
 		tp->d_secsize = lp->d_secsize;
 		tp->d_nsectors = lp->d_nsectors;
@@ -523,7 +522,6 @@ raioctl(dev_t dev, u_long cmd, void *dat
 	return (error);
 }
 
-
 int
 radump(dev_t dev, daddr_t blkno, void *va, size_t size)
 {

CVS commit: [netbsd-6] src/gnu/dist/gcc4/gcc/config/vax

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 18:29:57 UTC 2012

Modified Files:
src/gnu/dist/gcc4/gcc/config/vax [netbsd-6]: builtins.md

Log Message:
Pull up following revision(s) (requested by ragge in ticket #411):
gnu/dist/gcc4/gcc/config/vax/builtins.md: revision 1.3
Bugfix builtin ffs, fixes PR port-vax/46677, fix from Paul Koning.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.40.1 src/gnu/dist/gcc4/gcc/config/vax/builtins.md

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/gcc4/gcc/config/vax/builtins.md
diff -u src/gnu/dist/gcc4/gcc/config/vax/builtins.md:1.2 src/gnu/dist/gcc4/gcc/config/vax/builtins.md:1.2.40.1
--- src/gnu/dist/gcc4/gcc/config/vax/builtins.md:1.2	Mon Apr  2 16:45:39 2007
+++ src/gnu/dist/gcc4/gcc/config/vax/builtins.md	Thu Jul 12 18:29:57 2012
@@ -25,7 +25,7 @@
   "
 {
   rtx label = gen_label_rtx ();
-  emit_insn (gen_ffssi2_internal (operands[0], operands[1], operands[0]));
+  emit_insn (gen_ffssi2_internal (operands[0], operands[1], operands[1]));
   emit_jump_insn (gen_bne (label));
   emit_insn (gen_negsi2 (operands[0], const1_rtx));
   emit_label (label);
@@ -36,6 +36,6 @@
 (define_insn "ffssi2_internal"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=g")
 (ffs:SI (match_operand:SI 1 "general_operand" "nrQ")))
-   (set (cc0) (match_operand:SI 2 "nonimmediate_operand" "0"))]
+   (set (cc0) (ffs:SI (match_operand:SI 2 "general_operand" "1")))]
   ""
   "ffs $0,$32,%1,%0")

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

[David Laight]

Module Name:src
Committed By:   dsl
Date:   Thu Jul 12 18:13:08 UTC 2012

Modified Files:
src/sys/arch/i386/i386: freebsd_syscall.c ibcs2_syscall.c
svr4_syscall.c

Log Message:
Fix previous - syscall_fancy() didn't contain the check for p_trace_anabled.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/i386/freebsd_syscall.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/i386/i386/ibcs2_syscall.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/i386/i386/svr4_syscall.c

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

Modified files:

Index: src/sys/arch/i386/i386/freebsd_syscall.c
diff -u src/sys/arch/i386/i386/freebsd_syscall.c:1.38 src/sys/arch/i386/i386/freebsd_syscall.c:1.39
--- src/sys/arch/i386/i386/freebsd_syscall.c:1.38	Thu Jul 12 17:26:42 2012
+++ src/sys/arch/i386/i386/freebsd_syscall.c	Thu Jul 12 18:13:08 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_syscall.c,v 1.38 2012/07/12 17:26:42 dsl Exp $	*/
+/*	$NetBSD: freebsd_syscall.c,v 1.39 2012/07/12 18:13:08 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.38 2012/07/12 17:26:42 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.39 2012/07/12 18:13:08 dsl Exp $");
 
 #include 
 #include 
@@ -112,7 +112,8 @@ freebsd_syscall(struct trapframe *frame)
 			goto bad;
 	}
 
-	if ((error = trace_enter(code, args, callp->sy_narg)) == 0) {
+	if (!__predict_false(p->p_trace_enabled)
+	|| (error = trace_enter(code, args, callp->sy_narg)) == 0) {
 		rval[0] = 0;
 		rval[1] = frame->tf_edx; /* need to keep edx for shared FreeBSD bins */
 		error = sy_call(callp, l, args, rval);
@@ -142,7 +143,8 @@ freebsd_syscall(struct trapframe *frame)
 		break;
 	}
 
-	trace_exit(code, rval, error);
+	if (__predict_false(p->p_trace_enabled))
+		trace_exit(code, rval, error);
 
 	userret(l);
 }

Index: src/sys/arch/i386/i386/ibcs2_syscall.c
diff -u src/sys/arch/i386/i386/ibcs2_syscall.c:1.47 src/sys/arch/i386/i386/ibcs2_syscall.c:1.48
--- src/sys/arch/i386/i386/ibcs2_syscall.c:1.47	Thu Jul 12 17:26:42 2012
+++ src/sys/arch/i386/i386/ibcs2_syscall.c	Thu Jul 12 18:13:08 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_syscall.c,v 1.47 2012/07/12 17:26:42 dsl Exp $	*/
+/*	$NetBSD: ibcs2_syscall.c,v 1.48 2012/07/12 18:13:08 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_syscall.c,v 1.47 2012/07/12 17:26:42 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_syscall.c,v 1.48 2012/07/12 18:13:08 dsl Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
@@ -75,12 +75,14 @@ ibcs2_syscall(struct trapframe *frame)
 	char * params;
 	const struct sysent *callp;
 	struct lwp *l;
+	struct proc *p;
 	int error;
 	size_t argsize;
 	register_t code, args[8], rval[2];
 
 	l = curlwp;
-	LWP_CACHE_CREDS(l, l->l_proc);
+	p = l->l_proc;
+	LWP_CACHE_CREDS(l, p);
 
 	code = frame->tf_eax;
 	if (IBCS2_HIGH_SYSCALL(code))
@@ -109,7 +111,8 @@ ibcs2_syscall(struct trapframe *frame)
 			goto bad;
 	}
 
-	if ((error = trace_enter(code, args, callp->sy_narg)) == 0) {
+	if (!__predict_false(p->p_trace_enabled)
+	|| (error = trace_enter(code, args, callp->sy_narg)) == 0) {
 		rval[0] = 0;
 		rval[1] = 0;
 		error = sy_call(callp, l, args, rval);
@@ -140,7 +143,8 @@ ibcs2_syscall(struct trapframe *frame)
 		break;
 	}
 
-	trace_exit(code, rval, error);
+	if (__predict_false(p->p_trace_enabled))
+		trace_exit(code, rval, error);
 
 	userret(l);
 }

Index: src/sys/arch/i386/i386/svr4_syscall.c
diff -u src/sys/arch/i386/i386/svr4_syscall.c:1.46 src/sys/arch/i386/i386/svr4_syscall.c:1.47
--- src/sys/arch/i386/i386/svr4_syscall.c:1.46	Thu Jul 12 17:26:42 2012
+++ src/sys/arch/i386/i386/svr4_syscall.c	Thu Jul 12 18:13:08 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_syscall.c,v 1.46 2012/07/12 17:26:42 dsl Exp $	*/
+/*	$NetBSD: svr4_syscall.c,v 1.47 2012/07/12 18:13:08 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_syscall.c,v 1.46 2012/07/12 17:26:42 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_syscall.c,v 1.47 2012/07/12 18:13:08 dsl Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
@@ -74,12 +74,14 @@ svr4_syscall(struct trapframe *frame)
 	char *params;
 	const struct sysent *callp;
 	struct lwp *l;
+	struct proc *p;
 	int error;
 	size_t argsize;
 	register_t code, args[8], rval[2];
 
 	l = curlwp;
-	LWP_CACHE_CREDS(l, l->l_proc);
+	p = l->l_proc;
+	LWP_CACHE_CREDS(l, p);
 
 	code = frame->tf_eax;
 	callp = svr4_sysent;
@@ -106,7 +108,8 @@ svr4_syscall(struct trapframe *frame)
 			goto bad;
 	}
 
-	if ((error = trace_enter(code, args, callp->sy_narg)) == 0) {
+	if (!__predict_false(p->p_trace_enabled)
+	|| (error = trace_enter(code, args, callp->sy_narg)) == 0) {
 		rval

CVS commit: src/sys/dev/pci

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 17:37:24 UTC 2012

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

Log Message:
Ricoh R5C822 has working DMA, but does not advertise support for it, use force.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/sdhc_pci.c

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

Modified files:

Index: src/sys/dev/pci/sdhc_pci.c
diff -u src/sys/dev/pci/sdhc_pci.c:1.7 src/sys/dev/pci/sdhc_pci.c:1.8
--- src/sys/dev/pci/sdhc_pci.c:1.7	Fri Mar  2 18:20:33 2012
+++ src/sys/dev/pci/sdhc_pci.c	Thu Jul 12 17:37:24 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc_pci.c,v 1.7 2012/03/02 18:20:33 nonaka Exp $	*/
+/*	$NetBSD: sdhc_pci.c,v 1.8 2012/07/12 17:37:24 jakllsch Exp $	*/
 /*	$OpenBSD: sdhc_pci.c,v 1.7 2007/10/30 18:13:45 chl Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.7 2012/03/02 18:20:33 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.8 2012/07/12 17:37:24 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -119,6 +119,15 @@ static const struct sdhc_pci_quirk {
 		0,
 		SDHC_PCI_QUIRK_RICOH_LOWER_FREQ_HACK
 	},
+
+	{
+		PCI_VENDOR_RICOH,
+		PCI_PRODUCT_RICOH_Rx5C822,
+		0x,
+		0x,
+		~0,
+		SDHC_PCI_QUIRK_FORCE_DMA
+	},
 };
 
 static void sdhc_pci_quirk_ti_hack(struct pci_attach_args *);

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 17:27:42 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdhc.c

Log Message:
Completely rework (and enable) SDHC 1.0 DMA data transfer.

While without a large physically-contiguous buffer the performance
suffers severly, this should still be better than PIO.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.18 src/sys/dev/sdmmc/sdhc.c:1.19
--- src/sys/dev/sdmmc/sdhc.c:1.18	Thu Jul 12 17:15:27 2012
+++ src/sys/dev/sdmmc/sdhc.c	Thu Jul 12 17:27:42 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc.c,v 1.18 2012/07/12 17:15:27 jakllsch Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.19 2012/07/12 17:27:42 jakllsch Exp $	*/
 /*	$OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.18 2012/07/12 17:15:27 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.19 2012/07/12 17:27:42 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -296,7 +296,6 @@ sdhc_host_found(struct sdhc_softc *sc, b
 	caps = HREAD4(hp, SDHC_CAPABILITIES);
 	mutex_exit(&hp->host_mtx);
 
-#if notyet
 	/* Use DMA if the host system and the controller support it. */
 	if (ISSET(sc->sc_flags, SDHC_FLAG_FORCE_DMA)
 	 || ((ISSET(sc->sc_flags, SDHC_FLAG_USE_DMA)
@@ -304,7 +303,6 @@ sdhc_host_found(struct sdhc_softc *sc, b
 		SET(hp->flags, SHF_USE_DMA);
 		aprint_normal_dev(sc->sc_dev, "using DMA transfer\n");
 	}
-#endif
 
 	/*
 	 * Determine the base clock frequency. (2.2.24)
@@ -401,10 +399,8 @@ sdhc_host_found(struct sdhc_softc *sc, b
 		saa.saa_caps |= SMC_CAPS_8BIT_MODE;
 	if (ISSET(caps, SDHC_HIGH_SPEED_SUPP))
 		saa.saa_caps |= SMC_CAPS_SD_HIGHSPEED;
-#if notyet
 	if (ISSET(hp->flags, SHF_USE_DMA))
-		saa.saa_caps |= SMC_CAPS_DMA;
-#endif
+		saa.saa_caps |= SMC_CAPS_DMA | SMC_CAPS_MULTI_SEG_DMA;
 	hp->sdmmc = config_found(sc->sc_dev, &saa, sdhc_cfprint);
 
 	return 0;
@@ -1037,19 +1033,6 @@ sdhc_exec_command(sdmmc_chipset_handle_t
 		sdhc_transfer_data(hp, cmd);
 
 out:
-#if 0
-	if (cmd->c_dmamap != NULL && cmd->c_error == 0
-	&& ISSET(hp->flags, SHF_USE_DMA)
-	&& ISSET(cmd->c_flags, SCF_CMD_READ) {   
-		if (((uintptr_t)cmd->c_data & PAGE_MASK) + cmd->c_datalen > PAGE_SIZE) {
-			memcpy(cmd->c_data,
-			(void *)hp->sc->dma_map->dm_segs[0].ds_addr,
-			cmd->c_datalen);
-		}
-		bus_dmamap_unload(hp->sc->dt, hp->sc->dma_map);
-	}
-#endif
-
 	if (!ISSET(hp->sc->sc_flags, SDHC_FLAG_ENHANCED)
 	&& !ISSET(hp->sc->sc_flags, SDHC_FLAG_NO_LED_ON)) {
 		mutex_enter(&hp->host_mtx);
@@ -,11 +1094,7 @@ sdhc_start_command(struct sdhc_host *hp,
 		mode |= SDHC_AUTO_CMD12_ENABLE;
 	}
 	if (cmd->c_dmamap != NULL && cmd->c_datalen > 0) {
-		if (cmd->c_dmamap->dm_nsegs == 1) {
-			mode |= SDHC_DMA_ENABLE;
-		} else {
-			cmd->c_dmamap = NULL;
-		}
+		mode |= SDHC_DMA_ENABLE;
 	}
 
 	/*
@@ -1147,6 +1126,9 @@ sdhc_start_command(struct sdhc_host *hp,
 	DPRINTF(1,("%s: writing cmd: blksize=%d blkcnt=%d mode=%04x cmd=%04x\n",
 	HDEVNAME(hp), blksize, blkcount, mode, command));
 
+	blksize |= (MAX(0, PAGE_SHIFT - 12) & SDHC_DMA_BOUNDARY_MASK) <<
+	SDHC_DMA_BOUNDARY_SHIFT;	/* PAGE_SIZE DMA boundary */
+
 	mutex_enter(&hp->host_mtx);
 
 	if (!ISSET(hp->sc->sc_flags, SDHC_FLAG_ENHANCED)) {
@@ -1212,11 +1194,13 @@ sdhc_transfer_data(struct sdhc_host *hp,
 static int
 sdhc_transfer_data_dma(struct sdhc_host *hp, struct sdmmc_command *cmd)
 {
-	bus_dmamap_t dmap = cmd->c_dmamap;
-	uint16_t blklen = cmd->c_blklen;
-	uint16_t blkcnt = cmd->c_datalen / blklen;
-	uint16_t remain;
+	bus_dma_segment_t *dm_segs = cmd->c_dmamap->dm_segs;
+	bus_addr_t posaddr;
+	bus_addr_t segaddr;
+	bus_size_t seglen;
+	u_int seg = 0;
 	int error = 0;
+	int status;
 
 	KASSERT(HREAD2(hp, SDHC_NINTR_STATUS_EN) & SDHC_DMA_INTERRUPT);
 	KASSERT(HREAD2(hp, SDHC_NINTR_SIGNAL_EN) & SDHC_DMA_INTERRUPT);
@@ -1224,32 +1208,41 @@ sdhc_transfer_data_dma(struct sdhc_host 
 	KASSERT(HREAD2(hp, SDHC_NINTR_SIGNAL_EN) & SDHC_TRANSFER_COMPLETE);
 
 	for (;;) {
-		if (!sdhc_wait_intr(hp,
+		status = sdhc_wait_intr(hp,
 		SDHC_DMA_INTERRUPT|SDHC_TRANSFER_COMPLETE,
-		SDHC_DMA_TIMEOUT)) {
+		SDHC_DMA_TIMEOUT);
+
+		if (status & SDHC_TRANSFER_COMPLETE) {
+			break;
+		}
+		if (!status) {
 			error = ETIMEDOUT;
 			break;
 		}
+		if ((status & SDHC_DMA_INTERRUPT) == 0) {
+			continue;
+		}
 
-		/* single block mode */
-		if (blkcnt == 1)
-			break;
+		/* DMA Interrupt (boundary crossing) */
 
-		/* multi block mode */
-		remain = HREAD2(hp, SDHC_BLOCK_COUNT);
-		if (remain == 0)
-			break;
+		segaddr = dm_segs[seg].ds_addr;
+		seglen = dm_segs[seg].ds_len;
+		mutex_enter(&hp->host_mtx);
+		posaddr = HREAD4(hp, SDHC_DMA_ADDR);
+		mutex_exit(&hp->host_mtx);
 
-		HW

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

[David Laight]

Module Name:src
Committed By:   dsl
Date:   Thu Jul 12 17:26:42 UTC 2012

Modified Files:
src/sys/arch/i386/i386: freebsd_syscall.c ibcs2_syscall.c
svr4_syscall.c

Log Message:
No point in having separate xxx_syscall_fancy() and xxx_syscall_plain().
Remove the 'plain' ones.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/i386/freebsd_syscall.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/i386/i386/ibcs2_syscall.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/i386/i386/svr4_syscall.c

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

Modified files:

Index: src/sys/arch/i386/i386/freebsd_syscall.c
diff -u src/sys/arch/i386/i386/freebsd_syscall.c:1.37 src/sys/arch/i386/i386/freebsd_syscall.c:1.38
--- src/sys/arch/i386/i386/freebsd_syscall.c:1.37	Sat Nov 21 03:11:00 2009
+++ src/sys/arch/i386/i386/freebsd_syscall.c	Thu Jul 12 17:26:42 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_syscall.c,v 1.37 2009/11/21 03:11:00 rmind Exp $	*/
+/*	$NetBSD: freebsd_syscall.c,v 1.38 2012/07/12 17:26:42 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.37 2009/11/21 03:11:00 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.38 2012/07/12 17:26:42 dsl Exp $");
 
 #include 
 #include 
@@ -50,17 +50,13 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_sysc
 #include 
 #include 
 
-void freebsd_syscall_plain(struct trapframe *);
-void freebsd_syscall_fancy(struct trapframe *);
+void freebsd_syscall(struct trapframe *);
 
 void
 freebsd_syscall_intern(struct proc *p)
 {
 
-	if (trace_is_enabled(p))
-		p->p_md.md_syscall = freebsd_syscall_fancy;
-	else
-		p->p_md.md_syscall = freebsd_syscall_plain;
+	p->p_md.md_syscall = freebsd_syscall;
 }
 
 /*
@@ -69,87 +65,7 @@ freebsd_syscall_intern(struct proc *p)
  * Like trap(), argument is call by reference.
  */
 void
-freebsd_syscall_plain(struct trapframe *frame)
-{
-	char *params;
-	const struct sysent *callp;
-	struct lwp *l;
-	struct proc *p;
-	int error;
-	size_t argsize;
-	register_t code, args[8], rval[2];
-
-	l = curlwp;
-	p = l->l_proc;
-	LWP_CACHE_CREDS(l, p);
-
-	code = frame->tf_eax;
-	callp = p->p_emul->e_sysent;
-	params = (char *)frame->tf_esp + sizeof(int);
-
-	switch (code) {
-	case SYS_syscall:
-		/*
-		 * Code is first argument, followed by actual args.
-		 */
-		code = fuword(params);
-		params += sizeof(int);
-		break;
-	case SYS___syscall:
-		/*
-		 * Like syscall, but code is a quad, so as to maintain
-		 * quad alignment for the rest of the arguments.
-		 */
-		code = fuword(params + _QUAD_LOWWORD * sizeof(int));
-		params += sizeof(quad_t);
-		break;
-	default:
-		break;
-	}
-
-	code &= (FREEBSD_SYS_NSYSENT - 1);
-	callp += code;
-	argsize = callp->sy_argsize;
-	if (argsize) {
-		error = copyin(params, (void *)args, argsize);
-		if (error)
-			goto bad;
-	}
-
-	rval[0] = 0;
-	rval[1] = frame->tf_edx; /* need to keep edx for shared FreeBSD bins */
-
-	error = sy_call(callp, l, args, rval);
-
-	switch (error) {
-	case 0:
-		frame->tf_eax = rval[0];
-		frame->tf_edx = rval[1];
-		frame->tf_eflags &= ~PSL_C;	/* carry bit */
-		break;
-	case ERESTART:
-		/*
-		 * The offset to adjust the PC by depends on whether we entered
-		 * the kernel through the trap or call gate.  We pushed the
-		 * size of the instruction into tf_err on entry.
-		 */
-		frame->tf_eip -= frame->tf_err;
-		break;
-	case EJUSTRETURN:
-		/* nothing to do */
-		break;
-	default:
-	bad:
-		frame->tf_eax = error;
-		frame->tf_eflags |= PSL_C;	/* carry bit */
-		break;
-	}
-
-	userret(l);
-}
-
-void
-freebsd_syscall_fancy(struct trapframe *frame)
+freebsd_syscall(struct trapframe *frame)
 {
 	char *params;
 	const struct sysent *callp;

Index: src/sys/arch/i386/i386/ibcs2_syscall.c
diff -u src/sys/arch/i386/i386/ibcs2_syscall.c:1.46 src/sys/arch/i386/i386/ibcs2_syscall.c:1.47
--- src/sys/arch/i386/i386/ibcs2_syscall.c:1.46	Sat Nov 21 03:11:00 2009
+++ src/sys/arch/i386/i386/ibcs2_syscall.c	Thu Jul 12 17:26:42 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_syscall.c,v 1.46 2009/11/21 03:11:00 rmind Exp $	*/
+/*	$NetBSD: ibcs2_syscall.c,v 1.47 2012/07/12 17:26:42 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_syscall.c,v 1.46 2009/11/21 03:11:00 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_syscall.c,v 1.47 2012/07/12 17:26:42 dsl Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
@@ -54,18 +54,14 @@ __KERNEL_RCSID(0, "$NetBSD: ibcs2_syscal
 #include 
 #include 
 
-void ibcs2_syscall_plain(struct trapframe *);
-void ibcs2_syscall_fancy(struct trapframe *);
+void ibcs2_syscall(struct trapframe *);
 extern struct sysent ibcs2_sysent[];
 
 void
 ibcs2_syscall_intern(struct proc *p)
 {
 
-	if (trace_is_enabled(p))
-		p->p_md.md_syscall = ibcs2_syscall_fancy;
-	else
-		p->p

CVS commit: src/sys/fs/ntfs

[David Laight]

Module Name:src
Committed By:   dsl
Date:   Thu Jul 12 17:24:47 UTC 2012

Modified Files:
src/sys/fs/ntfs: ntfs_subr.c

Log Message:
Fix build - eg i386/ALL


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/fs/ntfs/ntfs_subr.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/fs/ntfs/ntfs_subr.c
diff -u src/sys/fs/ntfs/ntfs_subr.c:1.47 src/sys/fs/ntfs/ntfs_subr.c:1.48
--- src/sys/fs/ntfs/ntfs_subr.c:1.47	Sat Jun  2 16:26:24 2012
+++ src/sys/fs/ntfs/ntfs_subr.c	Thu Jul 12 17:24:47 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ntfs_subr.c,v 1.47 2012/06/02 16:26:24 christos Exp $	*/
+/*	$NetBSD: ntfs_subr.c,v 1.48 2012/07/12 17:24:47 dsl Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 Semen Ustimenko (sem...@freebsd.org)
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.47 2012/06/02 16:26:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.48 2012/07/12 17:24:47 dsl Exp $");
 
 #include 
 #include 
@@ -1134,7 +1134,7 @@ ntfs_isnamepermitted(
 
 	switch (iep->ie_fnametype) {
 	case 2:
-		ddprintf(("%s: skipped DOS name\n", __func_));
+		ddprintf(("%s: skipped DOS name\n", __func__));
 		return 0;
 	case 0: case 1: case 3:
 		return 1;
@@ -1493,7 +1493,7 @@ ntfs_writentvattr_plain(
 		return ENOTTY;
 	}
 
-	ddprintf(("%s: data in run: %lu chains\n", __func__
+	ddprintf(("%s: data in run: %lu chains\n", __func__,
 		 vap->va_vruncnt));
 
 	off = roff;

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu Jul 12 17:23:02 UTC 2012

Modified Files:
src/sys/arch/arm/include: byte_swap.h

Log Message:
Use __builtin_constant_p so that we only emit asm when
the expression is not a constant.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/byte_swap.h

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

Modified files:

Index: src/sys/arch/arm/include/byte_swap.h
diff -u src/sys/arch/arm/include/byte_swap.h:1.8 src/sys/arch/arm/include/byte_swap.h:1.9
--- src/sys/arch/arm/include/byte_swap.h:1.8	Mon Apr 28 20:23:14 2008
+++ src/sys/arch/arm/include/byte_swap.h	Thu Jul 12 17:23:02 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.8 2008/04/28 20:23:14 martin Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.9 2012/07/12 17:23:02 matt Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2002 The NetBSD Foundation, Inc.
@@ -40,16 +40,20 @@ __BEGIN_DECLS
 static __inline uint32_t
 __byte_swap_u32_variable(uint32_t v)
 {
-#ifdef _ARM_ARCH_6
-	__asm("rev\t%0, %1" : "=r" (v) : "0" (v));
-#else
 	uint32_t t1;
 
+#ifdef _ARM_ARCH_6
+	if (!__builtin_constant_p(v)) {
+		__asm("rev\t%0, %1" : "=r" (v) : "0" (v));
+		return v;
+	}
+#endif
+
 	t1 = v ^ ((v << 16) | (v >> 16));
 	t1 &= 0xff00U;
 	v = (v >> 8) | (v << 24);
 	v ^= (t1 >> 8);
-#endif
+
 	return (v);
 }
 
@@ -59,18 +63,23 @@ __byte_swap_u16_variable(uint16_t v)
 {
 
 #ifdef _ARM_ARCH_6
-	__asm("rev16\t%0, %1" : "=r" (v) : "0" (v));
+	if (!__builtin_constant_p(v)) {
+		__asm("rev16\t%0, %1" : "=r" (v) : "0" (v));
+		return v;
+	}
 #elif !defined(__thumb__)
-	__asm volatile(
-		"mov	%0, %1, ror #8\n"
-		"orr	%0, %0, %0, lsr #16\n"
-		"bic	%0, %0, %0, lsl #16"
-	: "=r" (v)
-	: "0" (v));
-#else
+	if (!__builtin_constant_p(v)) {
+		__asm volatile(
+			"mov	%0, %1, ror #8\n"
+			"orr	%0, %0, %0, lsr #16\n"
+			"bic	%0, %0, %0, lsl #16"
+		: "=&r" (v)
+		: "0" (v));
+		return (v);
+	}
+#endif
 	v &= 0x;
 	v = (v >> 8) | (v << 8);
-#endif
 
 	return (v);
 }

CVS commit: src/sys/arch/arm/arm

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu Jul 12 17:20:20 UTC 2012

Modified Files:
src/sys/arch/arm/arm: undefined.c

Log Message:
Add event counters for undefined instruction and cp15 instruction emulation.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arm/arm/undefined.c

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

Modified files:

Index: src/sys/arch/arm/arm/undefined.c
diff -u src/sys/arch/arm/arm/undefined.c:1.43 src/sys/arch/arm/arm/undefined.c:1.44
--- src/sys/arch/arm/arm/undefined.c:1.43	Wed Nov 16 16:59:47 2011
+++ src/sys/arch/arm/arm/undefined.c	Thu Jul 12 17:20:20 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: undefined.c,v 1.43 2011/11/16 16:59:47 he Exp $	*/
+/*	$NetBSD: undefined.c,v 1.44 2012/07/12 17:20:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001 Ben Harris.
@@ -54,7 +54,7 @@
 #include 
 #endif
 
-__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.43 2011/11/16 16:59:47 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.44 2012/07/12 17:20:20 matt Exp $");
 
 #include 
 #include 
@@ -122,6 +122,10 @@ remove_coproc_handler(void *cookie)
 	free(uh, M_TEMP);
 }
 
+static struct evcnt cp15_ev =
+EVCNT_INITIALIZER(EVCNT_TYPE_TRAP, NULL, "cpu0", "undefined cp15 insn traps");
+EVCNT_ATTACH_STATIC(cp15_ev);
+
 static int
 cp15_trapper(u_int addr, u_int insn, struct trapframe *frame, int code)
 {
@@ -151,7 +155,7 @@ cp15_trapper(u_int addr, u_int insn, str
 	 */
 	if ((insn & 0x0fff) == 0xee1d0f70) {
 		*regp = (uintptr_t)l->l_private;
-		frame->tf_pc += INSN_SIZE;
+		cp15_ev.ev_count++;
 		return 0;
 	}
 
@@ -165,6 +169,7 @@ cp15_trapper(u_int addr, u_int insn, str
 		else
 			pcb->pcb_user_pid_rw = *regp;
 		frame->tf_pc += INSN_SIZE;
+		cp15_ev.ev_count++;
 		return 0;
 	}
 
@@ -235,6 +240,10 @@ undefined_init(void)
 #endif
 }
 
+static struct evcnt und_ev =
+EVCNT_INITIALIZER(EVCNT_TYPE_TRAP, NULL, "cpu0", "undefined insn traps");
+EVCNT_ATTACH_STATIC(und_ev);
+
 void
 undefinedinstruction(trapframe_t *frame)
 {
@@ -249,6 +258,8 @@ undefinedinstruction(trapframe_t *frame)
 	int s;
 #endif
 
+	und_ev.ev_count++;
+
 	/* Enable interrupts if they were enabled before the exception. */
 #ifdef acorn26
 	if ((frame->tf_r15 & R15_IRQ_DISABLE) == 0)

CVS commit: [netbsd-6] src/sys/dev/mscp

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 17:17:27 UTC 2012

Modified Files:
src/sys/dev/mscp [netbsd-6]: mscp.c mscp.h mscp_subr.c

Log Message:
Pull up following revision(s) (requested by abs in ticket #410):
sys/dev/mscp/mscp.h: revision 1.9
sys/dev/mscp/mscp.c: revision 1.35
sys/dev/mscp/mscp_subr.c: revision 1.43
Adjust MSCP attach routines. The current code worked fine on simh-vax, but
unfortunately failed on at least one 'real' SCSI MSCP adaptor.
In the updated code
mscp_dorsp()


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.18.1 src/sys/dev/mscp/mscp.c
cvs rdiff -u -r1.8 -r1.8.116.1 src/sys/dev/mscp/mscp.h
cvs rdiff -u -r1.41.18.1 -r1.41.18.2 src/sys/dev/mscp/mscp_subr.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/mscp/mscp.c
diff -u src/sys/dev/mscp/mscp.c:1.34 src/sys/dev/mscp/mscp.c:1.34.18.1
--- src/sys/dev/mscp/mscp.c:1.34	Tue May 12 14:37:59 2009
+++ src/sys/dev/mscp/mscp.c	Thu Jul 12 17:17:27 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mscp.c,v 1.34 2009/05/12 14:37:59 cegger Exp $	*/
+/*	$NetBSD: mscp.c,v 1.34.18.1 2012/07/12 17:17:27 riz Exp $	*/
 
 /*
  * Copyright (c) 1988 Regents of the University of California.
@@ -76,7 +76,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.34 2009/05/12 14:37:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.34.18.1 2012/07/12 17:17:27 riz Exp $");
 
 #include 
 #include 
@@ -173,7 +173,8 @@ mscp_dorsp(struct mscp_softc *mi)
 	struct mscp_xi *mxi;
 	int nextrsp;
 	int st, error;
-	extern struct mscp slavereply;
+	extern struct mscp mscp_cold_reply;
+	extern int mscp_cold_unit;
 
 	nextrsp = mi->mi_rsp.mri_next;
 loop:
@@ -287,8 +288,12 @@ loop:
 		 * to set it up, otherwise it's just a "normal" unit
 		 * status.
 		 */
-		if (cold)
-			memcpy(&slavereply, mp, sizeof(struct mscp));
+		if (cold) {
+			memcpy(&mscp_cold_reply, mp, sizeof(struct mscp));
+			/* Detect that we've reached the end of all units */
+			if (mp->mscp_unit < mscp_cold_unit)
+break;
+		}
 
 		if (mp->mscp_status == (M_ST_OFFLINE|M_OFFLINE_UNKNOWN))
 			break;

Index: src/sys/dev/mscp/mscp.h
diff -u src/sys/dev/mscp/mscp.h:1.8 src/sys/dev/mscp/mscp.h:1.8.116.1
--- src/sys/dev/mscp/mscp.h:1.8	Sun Dec 11 12:22:47 2005
+++ src/sys/dev/mscp/mscp.h	Thu Jul 12 17:17:26 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mscp.h,v 1.8 2005/12/11 12:22:47 christos Exp $	*/
+/*	$NetBSD: mscp.h,v 1.8.116.1 2012/07/12 17:17:26 riz Exp $	*/
 
 /*
  * Copyright (c) 1988 Regents of the University of California.
@@ -40,6 +40,8 @@
  * IF DEC SOLD DOCUMENTATION FOR THEIR OWN CONTROLLERS.
  */
 
+#define MSCP_MAX_UNIT	4095
+
 /*
  * Control message opcodes
  */

Index: src/sys/dev/mscp/mscp_subr.c
diff -u src/sys/dev/mscp/mscp_subr.c:1.41.18.1 src/sys/dev/mscp/mscp_subr.c:1.41.18.2
--- src/sys/dev/mscp/mscp_subr.c:1.41.18.1	Wed Jul  4 20:41:47 2012
+++ src/sys/dev/mscp/mscp_subr.c	Thu Jul 12 17:17:27 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mscp_subr.c,v 1.41.18.1 2012/07/04 20:41:47 jdc Exp $	*/
+/*	$NetBSD: mscp_subr.c,v 1.41.18.2 2012/07/12 17:17:27 riz Exp $	*/
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -75,7 +75,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.41.18.1 2012/07/04 20:41:47 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.41.18.2 2012/07/12 17:17:27 riz Exp $");
 
 #include 
 #include 
@@ -112,7 +112,8 @@ CFATTACH_DECL(mscpbus, sizeof(struct msc
 #define	WRITE_IP(x)	bus_space_write_2(mi->mi_iot, mi->mi_iph, 0, (x))
 #define	WRITE_SW(x)	bus_space_write_2(mi->mi_iot, mi->mi_swh, 0, (x))
 
-struct	mscp slavereply;
+struct	mscp mscp_cold_reply;
+int	 mscp_cold_unit;
 
 #define NITEMS		4
 
@@ -178,7 +179,7 @@ mscp_attach(device_t parent, device_t se
 	struct mscp *mp2;
 	volatile struct mscp *mp;
 	volatile int i;
-	int	timeout, error, next = 0;
+	int	timeout, error, unit;
 
 	mi->mi_mc = ma->ma_mc;
 	mi->mi_me = NULL;
@@ -263,96 +264,101 @@ mscp_attach(device_t parent, device_t se
 	 * Go out and search for sub-units on this MSCP bus,
 	 * and call config_found for each found.
 	 */
-findunit:
-	mp = mscp_getcp(mi, MSCP_DONTWAIT);
-	if (mp == NULL)
-		panic("mscpattach: no packets");
-	mp->mscp_opcode = M_OP_GETUNITST;
-	mp->mscp_unit = next;
-	mp->mscp_modifier = M_GUM_NEXTUNIT;
-	*mp->mscp_addr |= MSCP_OWN | MSCP_INT;
-	slavereply.mscp_opcode = 0;
-
-	i = bus_space_read_2(mi->mi_iot, mi->mi_iph, 0);
-	mp = &slavereply;
-	timeout = 1000;
-	while (timeout-- > 0) {
-		DELAY(1);
-		if (mp->mscp_opcode)
-			goto gotit;
-	}
-	printf("%s: no response to Get Unit Status request\n",
-	device_xname(&mi->mi_dev));
-	return;
-
-gotit:	/*
-	 * Got a slave response.  If the unit is there, use it.
-	 */
-	switch (mp->mscp_status & M_ST_MASK) {
-
-	case M_ST_SUCCESS:	/* worked */
-	case M_ST_AVAILABLE:	/* found another drive */
-		break;		/* 

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 17:15:27 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdhc.c

Log Message:
No need to panic on failure to find a divisor.
Additionally, add commented out calculation of actual clock frequency.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.17 src/sys/dev/sdmmc/sdhc.c:1.18
--- src/sys/dev/sdmmc/sdhc.c:1.17	Thu Jul 12 16:58:50 2012
+++ src/sys/dev/sdmmc/sdhc.c	Thu Jul 12 17:15:27 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc.c,v 1.17 2012/07/12 16:58:50 jakllsch Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.18 2012/07/12 17:15:27 jakllsch Exp $	*/
 /*	$OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.17 2012/07/12 16:58:50 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.18 2012/07/12 17:15:27 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -721,6 +721,7 @@ sdhc_clock_divisor(struct sdhc_host *hp,
 *divp = SDHC_SDCLK_CGM
 | ((div & 0x300) << SDHC_SDCLK_XDIV_SHIFT)
 | ((div & 0x0ff) << SDHC_SDCLK_DIV_SHIFT);
+//freq = hp->clkbase / div;
 return true;
 			}
 		}
@@ -738,6 +739,7 @@ sdhc_clock_divisor(struct sdhc_host *hp,
 DPRINTF(2,
 ("%s: divisor for freq %u is %u * %u\n",
 HDEVNAME(hp), freq, div * 2, dvs + 1));
+//freq = hp->clkbase / (div * 2) * (dvs + 1);
 return true;
 			}
 			/*
@@ -745,11 +747,13 @@ sdhc_clock_divisor(struct sdhc_host *hp,
 			 */
 			roundup |= dvs & 1;
 		}
-		panic("%s: can't find divisor for freq %u", HDEVNAME(hp), freq);
+		/* No divisor found. */
+		return false;
 	} else {
 		for (div = 1; div <= 256; div *= 2) {
 			if ((hp->clkbase / div) <= freq) {
 *divp = (div / 2) << SDHC_SDCLK_DIV_SHIFT;
+//freq = hp->clkbase / div;
 return true;
 			}
 		}

CVS commit: [netbsd-6] src/sys/arch/powerpc/booke

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 17:15:17 UTC 2012

Modified Files:
src/sys/arch/powerpc/booke [netbsd-6]: e500_intr.c

Log Message:
Pull up following revision(s) (requested by matt in ticket #409):
sys/arch/powerpc/booke/e500_intr.c: revision 1.18
If we paniced because a watchdog timed out, PSL_CE will be clear.  So don't
assert PSL_CE is set if panicstr is not NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.16.8.1 -r1.16.8.2 src/sys/arch/powerpc/booke/e500_intr.c

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

Modified files:

Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.16.8.1 src/sys/arch/powerpc/booke/e500_intr.c:1.16.8.2
--- src/sys/arch/powerpc/booke/e500_intr.c:1.16.8.1	Wed Jun 13 19:41:28 2012
+++ src/sys/arch/powerpc/booke/e500_intr.c	Thu Jul 12 17:15:17 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: e500_intr.c,v 1.16.8.1 2012/06/13 19:41:28 riz Exp $	*/
+/*	$NetBSD: e500_intr.c,v 1.16.8.2 2012/07/12 17:15:17 riz Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -39,7 +39,7 @@
 #define __INTR_PRIVATE
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.16.8.1 2012/06/13 19:41:28 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.16.8.2 2012/07/12 17:15:17 riz Exp $");
 
 #include 
 #include 
@@ -491,7 +491,8 @@ e500_splx(int ipl)
 	struct cpu_info * const ci = curcpu();
 	const int old_ipl = ci->ci_cpl;
 
-	KASSERT(mfmsr() & PSL_CE);
+	/* if we paniced because of watchdog, PSL_CE will be clear.  */
+	KASSERT(panicstr != NULL || (mfmsr() & PSL_CE));
 
 	if (ipl == old_ipl)
 		return;
@@ -527,7 +528,8 @@ e500_splraise(int ipl)
 	struct cpu_info * const ci = curcpu();
 	const int old_ipl = ci->ci_cpl;
 
-	KASSERT(mfmsr() & PSL_CE);
+	/* if we paniced because of watchdog, PSL_CE will be clear.  */
+	KASSERT(panicstr != NULL || (mfmsr() & PSL_CE));
 
 	if (old_ipl < ipl) {
 		//const
@@ -814,7 +816,8 @@ e500_extintr(struct trapframe *tf)
 	struct cpu_softc * const cpu = ci->ci_softc;
 	const int old_ipl = ci->ci_cpl;
 
-	KASSERT(mfmsr() & PSL_CE);
+	/* if we paniced because of watchdog, PSL_CE will be clear.  */
+	KASSERT(panicstr != NULL || (mfmsr() & PSL_CE));
 
 #if 0
 //	printf("%s(%p): idepth=%d enter\n", __func__, tf, ci->ci_idepth);

CVS commit: src/sys/arch

[David Laight]

Module Name:src
Committed By:   dsl
Date:   Thu Jul 12 17:14:39 UTC 2012

Modified Files:
src/sys/arch/amd64/amd64: db_machdep.c
src/sys/arch/i386/i386: db_machdep.c

Log Message:
Neither i386 nor amd64 have had separate syscall_plain/fancy functions
  for ages, so this code can't be correct in looking for them.
Change to compare against "syscall".
I don't know if this changes any behaviour anywhere.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/amd64/db_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/i386/db_machdep.c

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

Modified files:

Index: src/sys/arch/amd64/amd64/db_machdep.c
diff -u src/sys/arch/amd64/amd64/db_machdep.c:1.2 src/sys/arch/amd64/amd64/db_machdep.c:1.3
--- src/sys/arch/amd64/amd64/db_machdep.c:1.2	Wed Feb 22 14:12:04 2012
+++ src/sys/arch/amd64/amd64/db_machdep.c	Thu Jul 12 17:14:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_machdep.c,v 1.2 2012/02/22 14:12:04 chs Exp $	*/
+/*	$NetBSD: db_machdep.c,v 1.3 2012/07/12 17:14:39 dsl Exp $	*/
 
 /* 
  * Mach Operating System
@@ -26,7 +26,7 @@
  * rights to redistribute these changes.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.2 2012/02/22 14:12:04 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.3 2012/07/12 17:14:39 dsl Exp $");
 
 #include 
 #include 
@@ -210,8 +210,7 @@ db_frame_info(long *frame, db_addr_t cal
 		if (!strcmp(name, "trap")) {
 			*is_trap = TRAP;
 			narg = 0;
-		} else if (!strcmp(name, "syscall_plain") ||
-		   !strcmp(name, "syscall_fancy")) {
+		} else if (!strcmp(name, "syscall")) {
 			*is_trap = SYSCALL;
 			narg = 0;
 		} else if (name[0] == 'X') {

Index: src/sys/arch/i386/i386/db_machdep.c
diff -u src/sys/arch/i386/i386/db_machdep.c:1.3 src/sys/arch/i386/i386/db_machdep.c:1.4
--- src/sys/arch/i386/i386/db_machdep.c:1.3	Thu Apr 14 16:05:59 2011
+++ src/sys/arch/i386/i386/db_machdep.c	Thu Jul 12 17:14:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_machdep.c,v 1.3 2011/04/14 16:05:59 yamt Exp $	*/
+/*	$NetBSD: db_machdep.c,v 1.4 2012/07/12 17:14:39 dsl Exp $	*/
 
 /* 
  * Mach Operating System
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.3 2011/04/14 16:05:59 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.4 2012/07/12 17:14:39 dsl Exp $");
 
 #include 
 #include 
@@ -138,8 +138,7 @@ db_frame_info(long *frame, db_addr_t cal
 		} else if (!strcmp(name, "trap")) {
 			*is_trap = TRAP;
 			narg = 0;
-		} else if (!strcmp(name, "syscall_plain") ||
-		   !strcmp(name, "syscall_fancy")) {
+		} else if (!strcmp(name, "syscall")) {
 			*is_trap = SYSCALL;
 			narg = 0;
 		} else if (name[0] == 'X') {

CVS commit: [netbsd-6] src/sys/kern

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 17:11:17 UTC 2012

Modified Files:
src/sys/kern [netbsd-6]: uipc_socket.c

Log Message:
Pull up following revision(s) (requested by chs in ticket #408):
sys/kern/uipc_socket.c: revision 1.211
in soreceive(), handle uios larger than 31 bits.
fixes the remaining problem in PR 43240.


To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.209.2.1 src/sys/kern/uipc_socket.c

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

Modified files:

Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.209 src/sys/kern/uipc_socket.c:1.209.2.1
--- src/sys/kern/uipc_socket.c:1.209	Wed Feb  1 02:27:23 2012
+++ src/sys/kern/uipc_socket.c	Thu Jul 12 17:11:17 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.209 2012/02/01 02:27:23 matt Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.209.2.1 2012/07/12 17:11:17 riz Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209 2012/02/01 02:27:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.1 2012/07/12 17:11:17 riz Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
@@ -1132,7 +1132,8 @@ soreceive(struct socket *so, struct mbuf
 {
 	struct lwp *l = curlwp;
 	struct mbuf	*m, **mp, *mt;
-	int atomic, flags, len, error, s, offset, moff, type, orig_resid;
+	size_t len, offset, moff, orig_resid;
+	int atomic, flags, error, s, type;
 	const struct protosw	*pr;
 	struct mbuf	*nextrecord;
 	int		mbuf_removed = 0;
@@ -1165,7 +1166,7 @@ soreceive(struct socket *so, struct mbuf
 			goto bad;
 		do {
 			error = uiomove(mtod(m, void *),
-			(int) min(uio->uio_resid, m->m_len), uio);
+			MIN(uio->uio_resid, m->m_len), uio);
 			m = m_free(m);
 		} while (uio->uio_resid > 0 && error == 0 && m);
  bad:
@@ -1419,7 +1420,7 @@ soreceive(struct socket *so, struct mbuf
 			SBLASTMBUFCHK(&so->so_rcv, "soreceive uiomove");
 			sounlock(so);
 			splx(s);
-			error = uiomove(mtod(m, char *) + moff, (int)len, uio);
+			error = uiomove(mtod(m, char *) + moff, len, uio);
 			s = splsoftnet();
 			solock(so);
 			if (error != 0) {

CVS commit: [netbsd-6] src/sys/arch/vax/include

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu Jul 12 17:07:38 UTC 2012

Modified Files:
src/sys/arch/vax/include [netbsd-6]: cpu.h

Log Message:
Pull up following revision(s) (requested by abs in ticket #407):
sys/arch/vax/include/cpu.h: revision 1.94
Change cpu_idle to be an inline which sets IPL to 1 and then back to 0
so simh can recognize the kernel is idle.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.93.8.1 src/sys/arch/vax/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/vax/include/cpu.h
diff -u src/sys/arch/vax/include/cpu.h:1.93 src/sys/arch/vax/include/cpu.h:1.93.8.1
--- src/sys/arch/vax/include/cpu.h:1.93	Sun Jun  5 16:59:21 2011
+++ src/sys/arch/vax/include/cpu.h	Thu Jul 12 17:07:38 2012
@@ -1,4 +1,4 @@
-/*  $NetBSD: cpu.h,v 1.93 2011/06/05 16:59:21 matt Exp $  */
+/*  $NetBSD: cpu.h,v 1.93.8.1 2012/07/12 17:07:38 riz Exp $  */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
@@ -162,7 +162,18 @@ extern int cpu_printfataltraps;
 		mtpr(AST_OK,PR_ASTLVL);		\
 	} while (/*CONSTCOND*/ 0)
 #define	cpu_proc_fork(x, y)	do { } while (/*CONSCOND*/0)
-#define	cpu_idle()		do { } while (/*CONSCOND*/0)
+
+/*
+ * This allows SIMH to recognize the kernel wants to sleep.
+ */
+static inline void
+cpu_idle(void)
+{
+	int ipl = mfpr(PR_IPL);
+	mtpr(1, PR_IPL);
+	mtpr(ipl, PR_IPL);
+}
+
 static inline bool
 cpu_intr_p(void)
 {

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 16:58:50 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdhc.c

Log Message:
SDHC can have multiple slots, note which slot a specific sdmmc(4) attaches to.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.16 src/sys/dev/sdmmc/sdhc.c:1.17
--- src/sys/dev/sdmmc/sdhc.c:1.16	Thu Jul 12 16:46:48 2012
+++ src/sys/dev/sdmmc/sdhc.c	Thu Jul 12 16:58:50 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc.c,v 1.16 2012/07/12 16:46:48 jakllsch Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.17 2012/07/12 16:58:50 jakllsch Exp $	*/
 /*	$OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.16 2012/07/12 16:46:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.17 2012/07/12 16:58:50 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -88,6 +88,7 @@ struct sdhc_host {
 };
 
 #define HDEVNAME(hp)	(device_xname((hp)->sc->sc_dev))
+#define HDEVINST(hp)	((int)(((hp)-(hp)->sc->sc_host[0])/sizeof(*(hp
 
 static uint8_t
 hread1(struct sdhc_host *hp, bus_size_t reg)
@@ -216,6 +217,20 @@ static struct sdmmc_chip_functions sdhc_
 	sdhc_card_intr_ack
 };
 
+static int
+sdhc_cfprint(void *aux, const char *pnp)
+{
+	const struct sdmmcbus_attach_args const * saa = aux;
+	const struct sdhc_host * const hp = saa->saa_sch;
+	
+	if (pnp) {
+		aprint_normal("sdmmc at %s", pnp);
+	}
+	aprint_normal(" slot %d", HDEVINST(hp));
+
+	return UNCONF;
+}
+
 /*
  * Called by attachment driver.  For each SD card slot there is one SD
  * host controller standard register set. (1.3)
@@ -390,7 +405,7 @@ sdhc_host_found(struct sdhc_softc *sc, b
 	if (ISSET(hp->flags, SHF_USE_DMA))
 		saa.saa_caps |= SMC_CAPS_DMA;
 #endif
-	hp->sdmmc = config_found(sc->sc_dev, &saa, NULL);
+	hp->sdmmc = config_found(sc->sc_dev, &saa, sdhc_cfprint);
 
 	return 0;
 

CVS commit: src/doc

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Thu Jul 12 16:55:57 UTC 2012

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Document import of dhcpcd-5.6.1


To generate a diff of this commit:
cvs rdiff -u -r1.947 -r1.948 src/doc/3RDPARTY
cvs rdiff -u -r1.1716 -r1.1717 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/3RDPARTY
diff -u src/doc/3RDPARTY:1.947 src/doc/3RDPARTY:1.948
--- src/doc/3RDPARTY:1.947	Wed Jul 11 22:43:19 2012
+++ src/doc/3RDPARTY	Thu Jul 12 16:55:57 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.947 2012/07/11 22:43:19 jmmv Exp $
+#	$NetBSD: 3RDPARTY,v 1.948 2012/07/12 16:55:57 roy Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -284,8 +284,8 @@ No changes for NetBSD integration - just
 top of the current tree.
 
 Package:	dhcpcd
-Version:	5.5.6
-Current Vers:	5.5.6
+Version:	5.6.1
+Current Vers:	5.6.1
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1716 src/doc/CHANGES:1.1717
--- src/doc/CHANGES:1.1716	Wed Jul 11 22:43:19 2012
+++ src/doc/CHANGES	Thu Jul 12 16:55:57 2012
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1716 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1717 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -79,3 +79,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		[bouyer 20120702]
 	kernel, libc: Add MurmurHash2 function. [rmind 20120708]
 	atf(7): Import 0.16.  [jmmv 20120711]
+	dhcpcd(8): Import dhcpcd-5.6.1 [roy 20120712]

CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Thu Jul 12 16:54:14 UTC 2012

Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile

Log Message:
Fix for dhcpcd-5.6.1


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile

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

Modified files:

Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.11 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.12
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.11	Wed Jan 25 14:39:05 2012
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile	Thu Jul 12 16:54:14 2012
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2012/01/25 14:39:05 roy Exp $
+# $NetBSD: Makefile,v 1.12 2012/07/12 16:54:14 roy Exp $
 #
 
 PROG=		dhcpcd
 SRCS=		arp.c bind.c common.c control.c configure.c dhcp.c dhcpcd.c \
-		duid.c eloop.c if-options.c if-pref.c ipv4ll.c ipv6rs.c net.c \
-		signals.c
+		duid.c eloop.c if-options.c if-pref.c \
+		ipv4ll.c ipv6.c ipv6ns.c ipv6rs.c \
+		net.c signals.c
 SRCS+=		bpf.c if-bsd.c platform-bsd.c
 
 .include 

CVS commit: src/external/bsd/dhcpcd/dist

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Thu Jul 12 16:51:21 UTC 2012

Modified Files:
src/external/bsd/dhcpcd/dist: dhcpcd.8.in

Log Message:
sync


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/dhcpcd/dist/dhcpcd.8.in

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

Modified files:

Index: src/external/bsd/dhcpcd/dist/dhcpcd.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.16 src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.17
--- src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.16	Fri Mar 23 20:49:05 2012
+++ src/external/bsd/dhcpcd/dist/dhcpcd.8.in	Thu Jul 12 16:51:21 2012
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 19, 2012
+.Dd June 7, 2012
 .Dt DHCPCD 8
 .Os
 .Sh NAME
@@ -102,8 +102,18 @@ is also an implementation of the BOOTP c
 .Pp
 .Nm
 is also an implementation of an IPv6 Router Solicitor as specified in
-.Li RFC 6106
-with regard to the RDNSS and DNSSL options.
+.Li RFC 4861
+and
+.Li RFC 6106 .
+.Nm
+can optionally handle address and route management itself,
+and will do so by default if Router Solicitation is disabled in the kernel.
+If
+.Nm
+is managing routes,
+.Nm
+sends Neighbor Solicitions to each advertising router periodically and will
+expire the ones that do not respond.
 .Ss Local Link configuration
 If
 .Nm
@@ -274,8 +284,12 @@ Override the
 .Ar vendorclassid
 field sent.
 The default is
-dhcpcd .
+dhcpcd-:::.
+For example
+.D1 dhcpcd-5.5.6:NetBSD-6.99.5:i386:i386
 If not set then none is sent.
+Some badly configured DHCP servers reject unknown vendorclassids.
+To work around it, try and impersonate Windows by using the MSFT vendorclassid.
 .It Fl k , Fl Fl release
 This causes an existing
 .Nm
@@ -578,7 +592,8 @@ running on the
 .Xr resolvconf 8
 .Sh STANDARDS
 RFC 951, RFC 1534, RFC 2131, RFC 2132, RFC 2855, RFC 3004, RFC 3361, RFC 3396,
-RFC 3397, RFC 3442, RFC 3927, RFC 4361, RFC 4390, RFC 4702, RFC 5969, RFC 6106.
+RFC 3397, RFC 3442, RFC 3927, RFC 4361, RFC 4390, RFC 4702, RFC 4861, RFC 5969,
+RFC 6106.
 .Sh AUTHORS
 .An Roy Marples Aq r...@marples.name
 .Sh BUGS

CVS commit: src/external/bsd/dhcpcd/dist

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Thu Jul 12 16:48:03 UTC 2012

Update of /cvsroot/src/external/bsd/dhcpcd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv15788

Log Message:
Import dhcpcd-5.6.1 with the following changes:

Improve IPv6 RA support by allowing dhcpcd to manage addreses and
routes instead of the kernel. dhcpcd will only do this if RA has been
disabled in the kernel or instructed to do so via the dhcpcd.conf(5)
ipv6ra_own and/or ipv6ra_owndefault directives.

Send and process IPv6 Neighbor Solicitions and Adverts to prove router 
reachability. If a router cannot be reached in this way then it is 
expired.

Status:

Vendor Tag: roy
Release Tags:   dhcpcd-5-6-1

U src/external/bsd/dhcpcd/dist/arp.c
U src/external/bsd/dhcpcd/dist/bind.c
U src/external/bsd/dhcpcd/dist/common.c
U src/external/bsd/dhcpcd/dist/control.c
U src/external/bsd/dhcpcd/dist/dhcp.c
U src/external/bsd/dhcpcd/dist/dhcpcd.c
U src/external/bsd/dhcpcd/dist/duid.c
U src/external/bsd/dhcpcd/dist/eloop.c
U src/external/bsd/dhcpcd/dist/configure.c
U src/external/bsd/dhcpcd/dist/if-options.c
U src/external/bsd/dhcpcd/dist/if-pref.c
U src/external/bsd/dhcpcd/dist/ipv4ll.c
U src/external/bsd/dhcpcd/dist/net.c
U src/external/bsd/dhcpcd/dist/signals.c
N src/external/bsd/dhcpcd/dist/ipv6.c
U src/external/bsd/dhcpcd/dist/ipv6rs.c
N src/external/bsd/dhcpcd/dist/ipv6ns.c
U src/external/bsd/dhcpcd/dist/bpf.c
U src/external/bsd/dhcpcd/dist/if-bsd.c
U src/external/bsd/dhcpcd/dist/platform-bsd.c
U src/external/bsd/dhcpcd/dist/dhcpcd.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
C src/external/bsd/dhcpcd/dist/dhcpcd.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
U src/external/bsd/dhcpcd/dist/arp.h
U src/external/bsd/dhcpcd/dist/bind.h
U src/external/bsd/dhcpcd/dist/bpf-filter.h
U src/external/bsd/dhcpcd/dist/common.h
U src/external/bsd/dhcpcd/dist/config.h
U src/external/bsd/dhcpcd/dist/configure.h
U src/external/bsd/dhcpcd/dist/control.h
U src/external/bsd/dhcpcd/dist/defs.h
U src/external/bsd/dhcpcd/dist/dhcp.h
U src/external/bsd/dhcpcd/dist/dhcpcd.h
U src/external/bsd/dhcpcd/dist/duid.h
U src/external/bsd/dhcpcd/dist/eloop.h
U src/external/bsd/dhcpcd/dist/if-options.h
U src/external/bsd/dhcpcd/dist/if-pref.h
U src/external/bsd/dhcpcd/dist/ipv4ll.h
N src/external/bsd/dhcpcd/dist/ipv6.h
N src/external/bsd/dhcpcd/dist/ipv6ns.h
U src/external/bsd/dhcpcd/dist/ipv6rs.h
U src/external/bsd/dhcpcd/dist/net.h
U src/external/bsd/dhcpcd/dist/platform.h
U src/external/bsd/dhcpcd/dist/signals.h
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 16:46:48 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdhc.c

Log Message:
SDHCI byte swaps the BE response on the wire into LE registers.
As we always want response data in LE, use bus_space_read_stream.
Additonally, read response data in 1 or 4 4-byte chunks, instead of
one 4-byte chunk or 15 1-byte chunks.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.15 src/sys/dev/sdmmc/sdhc.c:1.16
--- src/sys/dev/sdmmc/sdhc.c:1.15	Thu Jul 12 16:32:34 2012
+++ src/sys/dev/sdmmc/sdhc.c	Thu Jul 12 16:46:48 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc.c,v 1.15 2012/07/12 16:32:34 jakllsch Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.16 2012/07/12 16:46:48 jakllsch Exp $	*/
 /*	$OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.15 2012/07/12 16:32:34 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.16 2012/07/12 16:46:48 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -997,14 +997,14 @@ sdhc_exec_command(sdmmc_chipset_handle_t
 	 */
 	mutex_enter(&hp->host_mtx);
 	if (cmd->c_error == 0 && ISSET(cmd->c_flags, SCF_RSP_PRESENT)) {
-		if (ISSET(cmd->c_flags, SCF_RSP_136)) {
-			uint8_t *p = (uint8_t *)cmd->c_resp;
-			int i;
+		uint32_t *p = cmd->c_resp;
+		int i;
 
-			for (i = 0; i < 15; i++)
-*p++ = HREAD1(hp, SDHC_RESPONSE + i);
-		} else {
-			cmd->c_resp[0] = HREAD4(hp, SDHC_RESPONSE);
+		for (i = 0; i < 4; i++) {
+			*p++ = bus_space_read_stream_4(hp->iot, hp->ioh,
+			SDHC_RESPONSE + i * 4);
+			if (!ISSET(cmd->c_flags, SCF_RSP_136))
+break;
 		}
 	}
 	mutex_exit(&hp->host_mtx);

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 16:34:30 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdhcreg.h

Log Message:
Add DMA boundary field shift and mask.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sdmmc/sdhcreg.h

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

Modified files:

Index: src/sys/dev/sdmmc/sdhcreg.h
diff -u src/sys/dev/sdmmc/sdhcreg.h:1.6 src/sys/dev/sdmmc/sdhcreg.h:1.7
--- src/sys/dev/sdmmc/sdhcreg.h:1.6	Fri Mar  2 18:20:34 2012
+++ src/sys/dev/sdmmc/sdhcreg.h	Thu Jul 12 16:34:30 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhcreg.h,v 1.6 2012/03/02 18:20:34 nonaka Exp $	*/
+/*	$NetBSD: sdhcreg.h,v 1.7 2012/07/12 16:34:30 jakllsch Exp $	*/
 /*	$OpenBSD: sdhcreg.h,v 1.4 2006/07/30 17:20:40 fgsch Exp $	*/
 
 /*
@@ -23,6 +23,8 @@
 /* Host standard register set */
 #define SDHC_DMA_ADDR			0x00
 #define SDHC_BLOCK_SIZE			0x04
+#define  SDHC_DMA_BOUNDARY_SHIFT	12
+#define  SDHC_DMA_BOUNDARY_MASK		0x7
 #define SDHC_BLOCK_COUNT		0x06
 #define  SDHC_BLOCK_COUNT_MAX		512
 #define SDHC_ARGUMENT			0x08

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 16:32:34 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdhc.c

Log Message:
Always enable and set block count register.  We never do infinite transfers.
The old way seemed to be causing issues on a R5C822, at least with DMA enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.14 src/sys/dev/sdmmc/sdhc.c:1.15
--- src/sys/dev/sdmmc/sdhc.c:1.14	Thu Jul 12 03:05:49 2012
+++ src/sys/dev/sdmmc/sdhc.c	Thu Jul 12 16:32:34 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc.c,v 1.14 2012/07/12 03:05:49 matt Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.15 2012/07/12 16:32:34 jakllsch Exp $	*/
 /*	$OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.14 2012/07/12 03:05:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.15 2012/07/12 16:32:34 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -1083,16 +1083,13 @@ sdhc_start_command(struct sdhc_host *hp,
 	}
 
 	/* Prepare transfer mode register value. (2.2.5) */
-	mode = 0;
+	mode = SDHC_BLOCK_COUNT_ENABLE;
 	if (ISSET(cmd->c_flags, SCF_CMD_READ))
 		mode |= SDHC_READ_MODE;
-	if (blkcount > 0) {
-		mode |= SDHC_BLOCK_COUNT_ENABLE;
-		if (blkcount > 1) {
-			mode |= SDHC_MULTI_BLOCK_MODE;
-			/* XXX only for memory commands? */
-			mode |= SDHC_AUTO_CMD12_ENABLE;
-		}
+	if (blkcount > 1) {
+		mode |= SDHC_MULTI_BLOCK_MODE;
+		/* XXX only for memory commands? */
+		mode |= SDHC_AUTO_CMD12_ENABLE;
 	}
 	if (cmd->c_dmamap != NULL && cmd->c_datalen > 0) {
 		if (cmd->c_dmamap->dm_nsegs == 1) {
@@ -1151,11 +1148,10 @@ sdhc_start_command(struct sdhc_host *hp,
 		HWRITE4(hp, SDHC_ARGUMENT, cmd->c_arg);
 		HWRITE4(hp, SDHC_TRANSFER_MODE, mode | (command << 16));
 	} else {
-		HWRITE2(hp, SDHC_TRANSFER_MODE, mode);
 		HWRITE2(hp, SDHC_BLOCK_SIZE, blksize);
-		if (blkcount > 1)
-			HWRITE2(hp, SDHC_BLOCK_COUNT, blkcount);
+		HWRITE2(hp, SDHC_BLOCK_COUNT, blkcount);
 		HWRITE4(hp, SDHC_ARGUMENT, cmd->c_arg);
+		HWRITE2(hp, SDHC_TRANSFER_MODE, mode);
 		HWRITE2(hp, SDHC_COMMAND, command);
 	}
 

CVS commit: src/external/bsd/atf/lib/libatf-c++

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jul 12 16:15:40 UTC 2012

Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile

Log Message:
Properly include dependent library, unbreaks objdir build.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/atf/lib/libatf-c++/Makefile

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

Modified files:

Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.13 src/external/bsd/atf/lib/libatf-c++/Makefile:1.14
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.13	Wed Jul 11 18:40:16 2012
+++ src/external/bsd/atf/lib/libatf-c++/Makefile	Thu Jul 12 12:15:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/07/11 22:40:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2012/07/12 16:15:40 christos Exp $
 
 NOLINT=		# defined
 
@@ -6,8 +6,8 @@ NOLINT=		# defined
 
 LIB=		atf-c++
 LIBISCXX=	yes
-LDADD=		-L${.OBJDIR}/../libatf-c -latf-c
-DPADD=		${LIBATF_C}
+
+LIBDPLIBS+= atf-c  ${.CURDIR}/../libatf-c
 
 SRCDIR=		${NETBSDSRCDIR}/external/bsd/atf/dist
 .PATH:		${SRCDIR}

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 16:03:13 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdmmcreg.h

Log Message:
Add SD_STATUS (ACMD13) opcode.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/sdmmc/sdmmcreg.h

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

Modified files:

Index: src/sys/dev/sdmmc/sdmmcreg.h
diff -u src/sys/dev/sdmmc/sdmmcreg.h:1.8 src/sys/dev/sdmmc/sdmmcreg.h:1.9
--- src/sys/dev/sdmmc/sdmmcreg.h:1.8	Fri Jan 27 03:07:21 2012
+++ src/sys/dev/sdmmc/sdmmcreg.h	Thu Jul 12 16:03:13 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdmmcreg.h,v 1.8 2012/01/27 03:07:21 matt Exp $	*/
+/*	$NetBSD: sdmmcreg.h,v 1.9 2012/07/12 16:03:13 jakllsch Exp $	*/
 /*	$OpenBSD: sdmmcreg.h,v 1.4 2009/01/09 10:55:22 jsg Exp $	*/
 
 /*
@@ -61,6 +61,7 @@
 
 /* SD application commands */			/* response type */
 #define SD_APP_SET_BUS_WIDTH		6	/* R1 */
+#define SD_APP_SD_STATUS		13	/* R1 */
 #define SD_APP_OP_COND			41	/* R3 */
 #define SD_APP_SEND_SCR			51	/* R1 */
 

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 16:01:53 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdmmc.c

Log Message:
If necessary, unload and destroy dmamap upon detach.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/sdmmc/sdmmc.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/sdmmc/sdmmc.c
diff -u src/sys/dev/sdmmc/sdmmc.c:1.12 src/sys/dev/sdmmc/sdmmc.c:1.13
--- src/sys/dev/sdmmc/sdmmc.c:1.12	Wed Feb  1 22:34:42 2012
+++ src/sys/dev/sdmmc/sdmmc.c	Thu Jul 12 16:01:53 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdmmc.c,v 1.12 2012/02/01 22:34:42 matt Exp $	*/
+/*	$NetBSD: sdmmc.c,v 1.13 2012/07/12 16:01:53 jakllsch Exp $	*/
 /*	$OpenBSD: sdmmc.c,v 1.18 2009/01/09 10:58:38 jsg Exp $	*/
 
 /*
@@ -49,7 +49,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.12 2012/02/01 22:34:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.13 2012/07/12 16:01:53 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -192,6 +192,12 @@ sdmmc_detach(device_t self, int flags)
 	error = config_detach_children(self, flags);
 	if (error)
 		return error;
+
+	if (ISSET(sc->sc_caps, SMC_CAPS_DMA)) {
+		bus_dmamap_unload(sc->sc_dmat, sc->sc_dmap);
+		bus_dmamap_destroy(sc->sc_dmat, sc->sc_dmap);
+	}
+
 	return 0;
 }
 

CVS commit: src/sys/dev/sdmmc

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Jul 12 15:59:32 UTC 2012

Modified Files:
src/sys/dev/sdmmc: sdmmcvar.h

Log Message:
Replace integer constant SDMMC_MAXNSEGS with the formula said value was
calculated from.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sdmmc/sdmmcvar.h

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

Modified files:

Index: src/sys/dev/sdmmc/sdmmcvar.h
diff -u src/sys/dev/sdmmc/sdmmcvar.h:1.13 src/sys/dev/sdmmc/sdmmcvar.h:1.14
--- src/sys/dev/sdmmc/sdmmcvar.h:1.13	Wed Jul 11 18:21:27 2012
+++ src/sys/dev/sdmmc/sdmmcvar.h	Thu Jul 12 15:59:32 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdmmcvar.h,v 1.13 2012/07/11 18:21:27 jakllsch Exp $	*/
+/*	$NetBSD: sdmmcvar.h,v 1.14 2012/07/12 15:59:32 jakllsch Exp $	*/
 /*	$OpenBSD: sdmmcvar.h,v 1.13 2009/01/09 10:55:22 jsg Exp $	*/
 
 /*
@@ -201,7 +201,7 @@ struct sdmmc_softc {
 	sdmmc_chipset_handle_t sc_sch;	/* host controller chipset handle */
 	bus_dma_tag_t sc_dmat;
 	bus_dmamap_t sc_dmap;
-#define	SDMMC_MAXNSEGS		17	/* (MAXPHYS / PAGE_SIZE) + 1 */
+#define	SDMMC_MAXNSEGS		((MAXPHYS / PAGE_SIZE) + 1)
 
 	struct kmutex sc_mtx;		/* lock around host controller */
 	int sc_dying;			/* bus driver is shutting down */

CVS commit: src/sys/dev/ic

[Reinoud Zandijk]

Module Name:src
Committed By:   reinoud
Date:   Thu Jul 12 14:17:03 UTC 2012

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

Log Message:
Fix surplus ( that was forgotten to remove in the DRIVE_ to DRIVET_ rototol.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/mvsata.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/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.17 src/sys/dev/ic/mvsata.c:1.18
--- src/sys/dev/ic/mvsata.c:1.17	Mon Jul  2 18:15:46 2012
+++ src/sys/dev/ic/mvsata.c	Thu Jul 12 14:17:03 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mvsata.c,v 1.17 2012/07/02 18:15:46 bouyer Exp $	*/
+/*	$NetBSD: mvsata.c,v 1.18 2012/07/12 14:17:03 reinoud Exp $	*/
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.17 2012/07/02 18:15:46 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.18 2012/07/12 14:17:03 reinoud Exp $");
 
 #include "opt_mvsata.h"
 
@@ -792,7 +792,7 @@ mvsata_atapi_probe_device(struct atapibu
 		return;
 
 	/* if no ATAPI device detected at attach time, skip */
-	if ((drvp->drive_type != DRIVET_ATAPI) {
+	if (drvp->drive_type != DRIVET_ATAPI) {
 		DPRINTF(("%s:%d: mvsata_atapi_probe_device:"
 		" drive %d not present\n",
 		device_xname(atac->atac_dev), chp->ch_channel, target));

CVS commit: xsrc/external/mit/xsetpointer/dist

[Thomas Klausner]

Module Name:xsrc
Committed By:   wiz
Date:   Thu Jul 12 13:16:52 UTC 2012

Modified Files:
xsrc/external/mit/xsetpointer/dist: xsetpointer.c

Log Message:
Instead of local patch, use official upstream fix.
commit 1326fcb6afe5a62b675bf99826f7e628c66237b4
Author: Paulo Cesar Pereira de Andrade 
Date:   Thu Jan 15 16:15:23 2009 -0200

Ansification and compile warning fixes.

  This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and most gcc 4.3 and sparse warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xsetpointer/dist/xsetpointer.c

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

Modified files:

Index: xsrc/external/mit/xsetpointer/dist/xsetpointer.c
diff -u xsrc/external/mit/xsetpointer/dist/xsetpointer.c:1.2 xsrc/external/mit/xsetpointer/dist/xsetpointer.c:1.3
--- xsrc/external/mit/xsetpointer/dist/xsetpointer.c:1.2	Thu Aug 11 22:37:06 2011
+++ xsrc/external/mit/xsetpointer/dist/xsetpointer.c	Thu Jul 12 13:16:52 2012
@@ -103,7 +103,7 @@ main(int argc, char * argv[])
   for(loop=0; loop");
+	  printf("%d: \"%s\"	[", (int)devices[loop].id, devices[loop].name ? devices[loop].name : "");
 	  switch(devices[loop].use) {
 	  case IsXPointer:
 		  printf("XPointer]\n");

CVS commit: src/x11/bin/xconsole

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Jul 12 12:43:06 UTC 2012

Modified Files:
src/x11/bin/xconsole: Makefile

Log Message:
Revert previous: tsutsui noted that this file is for X11R6.
The one for X11R7 already had HAVE_OPENPTY defined.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/x11/bin/xconsole/Makefile

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

Modified files:

Index: src/x11/bin/xconsole/Makefile
diff -u src/x11/bin/xconsole/Makefile:1.4 src/x11/bin/xconsole/Makefile:1.5
--- src/x11/bin/xconsole/Makefile:1.4	Thu Jul 12 10:14:04 2012
+++ src/x11/bin/xconsole/Makefile	Thu Jul 12 12:43:06 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2012/07/12 10:14:04 wiz Exp $
+#	$NetBSD: Makefile,v 1.5 2012/07/12 12:43:06 wiz Exp $
 
 .include 
 
@@ -6,7 +6,6 @@ PROG=	xconsole
 
 APPDEFS=XConsole.ad
 
-CPPFLAGS+=-DHAS_OPENPTY
 LDADD+=	-lutil -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
 DPADD+=	${LIBUTIL} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
 	${LIBXPM} ${LIBXEXT} ${LIBX11}

CVS commit: xsrc/external/mit/xinit/dist

[Thomas Klausner]

Module Name:xsrc
Committed By:   wiz
Date:   Thu Jul 12 12:00:08 UTC 2012

Modified Files:
xsrc/external/mit/xinit/dist: xinit.c

Log Message:
Instead of local patch, merge upstream git version:
commit 45cc81cd7abafe61bddb3ddce9f4fb8a9aa06c12
Author: Julien Cristau 
Date:   Thu Sep 8 22:11:15 2011 +0200

Include  and  unconditionally

Suggested by Mark Kettenis.

X.Org bug#40632 

Signed-off-by: Julien Cristau 


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xinit/dist/xinit.c

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

Modified files:

Index: xsrc/external/mit/xinit/dist/xinit.c
diff -u xsrc/external/mit/xinit/dist/xinit.c:1.3 xsrc/external/mit/xinit/dist/xinit.c:1.4
--- xsrc/external/mit/xinit/dist/xinit.c:1.3	Wed Aug  3 02:50:11 2011
+++ xsrc/external/mit/xinit/dist/xinit.c	Thu Jul 12 12:00:08 2012
@@ -49,10 +49,8 @@ in this Software without prior written a
 #endif
 
 /* For PRIO_PROCESS and setpriority() */
-#if defined(__DragonFly__) || defined(__NetBSD__)
 #include 
 #include 
-#endif /* __DragonFly__ */
 
 #include 
 

CVS commit: xsrc/external/mit/xconsole/dist

[Thomas Klausner]

Module Name:xsrc
Committed By:   wiz
Date:   Thu Jul 12 10:14:50 UTC 2012

Modified Files:
xsrc/external/mit/xconsole/dist: xconsole.c

Log Message:
Revert local patch adding a call to openpty.
Defining HAS_OPENPTY (which I just added in the crossover Makefile)
has the same effect.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xconsole/dist/xconsole.c

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

Modified files:

Index: xsrc/external/mit/xconsole/dist/xconsole.c
diff -u xsrc/external/mit/xconsole/dist/xconsole.c:1.3 xsrc/external/mit/xconsole/dist/xconsole.c:1.4
--- xsrc/external/mit/xconsole/dist/xconsole.c:1.3	Sun Nov 21 01:19:29 2010
+++ xsrc/external/mit/xconsole/dist/xconsole.c	Thu Jul 12 10:14:50 2012
@@ -912,9 +912,6 @@ get_pty(int *pty, int *tty, char *ttydev
 		return 0;
 	}
 #else
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-	return openpty(pty, tty, ttydev, NULL, NULL);
-#else
 	strcpy (ttydev, "/dev/ttyxx");
 	strcpy (ptydev, "/dev/ptyxx");
 	while (PTYCHAR1[letter]) {
@@ -941,7 +938,6 @@ get_pty(int *pty, int *tty, char *ttydev
 	devindex = 0;
 	(void) letter++;
 	}
-#endif /* BSD4_4 else not BSD4_4 */
 #endif /* sgi else not sgi */
 #endif /* CRAY else not CRAY */
 #endif /* umips && SYSTYPE_SYSV */

CVS commit: src/x11/bin/xconsole

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Jul 12 10:14:04 UTC 2012

Modified Files:
src/x11/bin/xconsole: Makefile

Log Message:
Define HAS_OPENPTY in CPPFLAGS (since this Makefile doesn't use a config.h).


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/x11/bin/xconsole/Makefile

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

Modified files:

Index: src/x11/bin/xconsole/Makefile
diff -u src/x11/bin/xconsole/Makefile:1.3 src/x11/bin/xconsole/Makefile:1.4
--- src/x11/bin/xconsole/Makefile:1.3	Wed Nov 10 03:21:02 2004
+++ src/x11/bin/xconsole/Makefile	Thu Jul 12 10:14:04 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2004/11/10 03:21:02 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2012/07/12 10:14:04 wiz Exp $
 
 .include 
 
@@ -6,6 +6,7 @@ PROG=	xconsole
 
 APPDEFS=XConsole.ad
 
+CPPFLAGS+=-DHAS_OPENPTY
 LDADD+=	-lutil -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
 DPADD+=	${LIBUTIL} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
 	${LIBXPM} ${LIBXEXT} ${LIBX11}

CVS commit: src/sys/dev/marvell

[KIYOHARA Takashi]

Module Name:src
Committed By:   kiyohara
Date:   Thu Jul 12 09:39:53 UTC 2012

Modified Files:
src/sys/dev/marvell: marvellreg.h

Log Message:
Add 88f6282.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/marvell/marvellreg.h

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

Modified files:

Index: src/sys/dev/marvell/marvellreg.h
diff -u src/sys/dev/marvell/marvellreg.h:1.5 src/sys/dev/marvell/marvellreg.h:1.6
--- src/sys/dev/marvell/marvellreg.h:1.5	Tue Jul 20 12:01:33 2010
+++ src/sys/dev/marvell/marvellreg.h	Thu Jul 12 09:39:53 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: marvellreg.h,v 1.5 2010/07/20 12:01:33 kiyohara Exp $	*/
+/*	$NetBSD: marvellreg.h,v 1.6 2012/07/12 09:39:53 kiyohara Exp $	*/
 /*
  * Copyright (c) 2009 KIYOHARA Takashi
  * All rights reserved.
@@ -54,6 +54,7 @@
 #define MARVELL_KIRKWOOD_88F6180	PCI_PRODUCT_MARVELL_88F6180
 #define MARVELL_KIRKWOOD_88F6192	PCI_PRODUCT_MARVELL_88F6192
 #define MARVELL_KIRKWOOD_88F6281	PCI_PRODUCT_MARVELL_88F6281
+#define MARVELL_KIRKWOOD_88F6282	PCI_PRODUCT_MARVELL_88F6282
 
 #define MARVELL_MV78XX0_MV78100		PCI_PRODUCT_MARVELL_MV78100
 #define MARVELL_MV78XX0_MV78200		PCI_PRODUCT_MARVELL_MV78200

CVS commit: src/sys/dev/pci

[KIYOHARA Takashi]

Module Name:src
Committed By:   kiyohara
Date:   Thu Jul 12 09:29:32 UTC 2012

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

Log Message:
Add Marvell SoC 88F6282.


To generate a diff of this commit:
cvs rdiff -u -r1.1118 -r1.1119 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.1118 src/sys/dev/pci/pcidevs:1.1119
--- src/sys/dev/pci/pcidevs:1.1118	Tue Jun 26 19:00:59 2012
+++ src/sys/dev/pci/pcidevs	Thu Jul 12 09:29:31 2012
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1118 2012/06/26 19:00:59 drochner Exp $
+$NetBSD: pcidevs,v 1.1119 2012/07/12 09:29:31 kiyohara Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2171,6 +2171,7 @@ product MARVELL 88F6180		0x6180	88F6180 
 product MARVELL 88F6183		0x6183	88F6183 SoC Orion1
 product MARVELL 88F6192		0x6192	88F6192 SoC Kirkwood
 product MARVELL 88F6281		0x6281	88F6281 SoC Kirkwood
+product MARVELL 88F6282		0x6282	88F6282 SoC Kirkwood
 product MARVELL GT64130		0x6320	GT-64130 System Controller
 product MARVELL GT64260		0x6430	GT-64260 System Controller
 product MARVELL MV64360		0x6460	MV6436x System Controller