date:20100722

CVS commit: src/sys/dev/acpi

2010-07-22 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Fri Jul 23 05:32:02 UTC 2010

Modified Files:
src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_cstate.c

Log Message:
Remove the recently added ACPICPU_FLAG_INIT and instead operate with the
existing ACPICPU_FLAG_C, as was intended. Set that flag only after the
idle-loop has been installed, so that the notify handler errors out if an
interrupt is received before the idle-loop is in place.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpi_cpu.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_cpu.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_cpu_cstate.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/acpi/acpi_cpu.c
diff -u src/sys/dev/acpi/acpi_cpu.c:1.4 src/sys/dev/acpi/acpi_cpu.c:1.5
--- src/sys/dev/acpi/acpi_cpu.c:1.4	Wed Jul 21 14:59:31 2010
+++ src/sys/dev/acpi/acpi_cpu.c	Fri Jul 23 05:32:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.c,v 1.4 2010/07/21 14:59:31 cegger Exp $ */
+/* $NetBSD: acpi_cpu.c,v 1.5 2010/07/23 05:32:02 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen 
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.4 2010/07/21 14:59:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.5 2010/07/23 05:32:02 jruoho Exp $");
 
 #include 
 #include 
@@ -78,6 +78,7 @@
 {
 	struct acpi_attach_args *aa = aux;
 	struct acpicpu_object ao;
+	int rv;
 
 	if (aa->aa_node->ad_type != ACPI_TYPE_PROCESSOR)
 		return 0;
@@ -85,9 +86,11 @@
 	if (acpi_match_hid(aa->aa_node->ad_devinfo, acpicpu_hid) != 0)
 		return 1;
 
-	int rv = acpicpu_object(aa->aa_node->ad_handle, &ao);
-	if (rv == 0 || acpicpu_id(ao.ao_procid) == 0xFF)
+	rv = acpicpu_object(aa->aa_node->ad_handle, &ao);
+
+	if (rv != 0 || acpicpu_id(ao.ao_procid) == 0xFF)
 		return 0;
+
 	return 1;
 }
 
@@ -101,7 +104,7 @@
 
 	rv = acpicpu_object(aa->aa_node->ad_handle, &sc->sc_object);
 
-	if (rv == 0)
+	if (rv != 0)
 		return;
 
 	rv = RUN_ONCE(&once_attach, acpicpu_once_attach);
@@ -262,7 +265,7 @@
 	if (buf.Pointer != NULL)
 		ACPI_FREE(buf.Pointer);
 
-	return ACPI_FAILURE(rv) ? 0 : 1;
+	return ACPI_FAILURE(rv) ? 1 : 0;
 }
 
 static cpuid_t
@@ -272,6 +275,7 @@
 	struct cpu_info *ci;
 
 	for (CPU_INFO_FOREACH(cii, ci)) {
+
 		if (id == ci->ci_cpuid)
 			return id;
 	}
@@ -437,9 +441,6 @@
 
 	sc = device_private(self);
 
-	if ((sc->sc_flags & ACPICPU_FLAG_INIT) == 0)
-		return;
-
 	switch (evt) {
 
 	case ACPICPU_C_NOTIFY:

Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.3 src/sys/dev/acpi/acpi_cpu.h:1.4
--- src/sys/dev/acpi/acpi_cpu.h:1.3	Mon Jul 19 00:59:32 2010
+++ src/sys/dev/acpi/acpi_cpu.h	Fri Jul 23 05:32:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.h,v 1.3 2010/07/19 00:59:32 christos Exp $ */
+/* $NetBSD: acpi_cpu.h,v 1.4 2010/07/23 05:32:02 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen 
@@ -86,7 +86,6 @@
 #define ACPICPU_FLAG_C_NOC3	 __BIT(7)
 #define ACPICPU_FLAG_C_MWAIT	 __BIT(8)
 #define ACPICPU_FLAG_C_C1E	 __BIT(9)
-#define ACPICPU_FLAG_INIT	 __BIT(31)
 
 struct acpicpu_cstate {
 	uint64_t		 cs_stat;

Index: src/sys/dev/acpi/acpi_cpu_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.5 src/sys/dev/acpi/acpi_cpu_cstate.c:1.6
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.5	Mon Jul 19 00:59:32 2010
+++ src/sys/dev/acpi/acpi_cpu_cstate.c	Fri Jul 23 05:32:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.5 2010/07/19 00:59:32 christos Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.6 2010/07/23 05:32:02 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen 
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.5 2010/07/19 00:59:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.6 2010/07/23 05:32:02 jruoho Exp $");
 
 #include 
 #include 
@@ -94,12 +94,12 @@
 	switch (rv) {
 
 	case AE_OK:
-		sc->sc_flags |= ACPICPU_FLAG_C | ACPICPU_FLAG_C_CST;
+		sc->sc_flags |= ACPICPU_FLAG_C_CST;
 		acpicpu_cstate_cst_bios();
 		break;
 
 	default:
-		sc->sc_flags |= ACPICPU_FLAG_C | ACPICPU_FLAG_C_FADT;
+		sc->sc_flags |= ACPICPU_FLAG_C_FADT;
 		acpicpu_cstate_fadt(sc);
 		break;
 	}
@@ -192,9 +192,6 @@
 	static ONCE_DECL(once_save);
 	int rv;
 
-	if ((sc->sc_flags & ACPICPU_FLAG_C) == 0)
-		return 0;
-
 	/*
 	 * Save the existing idle-mechanism and claim the idle_loop(9).
 	 * This should be called after all ACPI CPUs have been attached.
@@ -205,8 +202,10 @@
 		return rv;
 
 	rv = RUN_ONCE(&once_start, acpicpu_md_idle_start);
+
 	if (rv == 0)
-		sc->sc_flags |= ACPICPU_FLAG_INIT;
+		sc->sc_flags |= ACPICPU_FLAG_C;
+
 	return rv;
 }

CVS commit: src/sys/compat/ibcs2

2010-07-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Jul 23 02:46:13 UTC 2010

Modified Files:
src/sys/compat/ibcs2: syscalls.master

Log Message:
document more unimplemented syscalls


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/compat/ibcs2/syscalls.master

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

Modified files:

Index: src/sys/compat/ibcs2/syscalls.master
diff -u src/sys/compat/ibcs2/syscalls.master:1.37 src/sys/compat/ibcs2/syscalls.master:1.38
--- src/sys/compat/ibcs2/syscalls.master:1.37	Tue Jan 13 17:27:43 2009
+++ src/sys/compat/ibcs2/syscalls.master	Thu Jul 22 22:46:12 2010
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.37 2009/01/13 22:27:43 pooka Exp $
+	$NetBSD: syscalls.master,v 1.38 2010/07/23 02:46:12 christos Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -161,8 +161,8 @@
 80	NOARGS		{ int|sys||mkdir(const char *path, int mode); }
 81	STD		{ int|ibcs2_sys||getdents(int fd, char *buf, \
 			int nbytes); }
-82	UNIMPL
-83	UNIMPL
+82	UNIMPL		libattach
+83	UNIMPL		libdetach
 84	STD		{ int|ibcs2_sys||sysfs(int cmd, void *d1, char *buf); }
 85	STD		{ int|ibcs2_sys||getmsg(int fd, \
 			struct ibcs2_stropts *ctl, \
@@ -172,8 +172,10 @@
 			struct ibcs2_stropts *dat, int flags); }
 87	NOARGS		{ int|sys||poll(struct pollfd *fds, u_int nfds, \
 			int timeout); }
-88	UNIMPL
-89	UNIMPL
+88	STD		{ int|ibcs2_sys||lstat(const char *path, \
+			struct ibcs2_stat *st); }
+89	NOARGS		{ int|sys||symlink(const char *path, \
+			const char *link); }
 90	NOARGS		{ int|sys||symlink(const char *path, \
 			const char *link); }
 91	STD		{ int|ibcs2_sys||lstat(const char *path, \
@@ -183,37 +185,37 @@
 93	NOARGS		{ int|sys||fchmod(int fd, int mode); }
 94	NOARGS		{ int|sys||__posix_fchown(int fd, int uid, int gid); } \
 			fchown
-95	UNIMPL
+95	UNIMPL		sigprocmask
 96	NOARGS		{ int|compat_16_sys|14|sigreturn(struct sigcontext \
 			*sigcntxp); } sigreturn
 97	STD		{ int|ibcs2_sys||sigaltstack( \
 			const struct ibcs2_sigaltstack *nss, \
 			struct ibcs2_sigaltstack *oss); }
-98	UNIMPL
-99	UNIMPL
+98	UNIMPL		sigaction
+99	UNIMPL		sigpending
 100	UNIMPL		getcontext/setcontext/sigsetjmp
-101	UNIMPL
-102	UNIMPL
+101	UNIMPL		envsys
+102	UNIMP		evtrapret
 103	STD		{ int|ibcs2_sys||statvfs(const char *path, \
 			struct ibcs2_statvfs *buf); }
 104	STD		{ int|ibcs2_sys||fstatvfs(int fd, \
 			struct ibcs2_statvfs *buf); }
 105	UNIMPL
-106	UNIMPL
-107	UNIMPL		waitid
-108	UNIMPL		sigsendset
-109	UNIMPL
-110	UNIMPL
-111	UNIMPL
-112	UNIMPL		priocntl
-113	UNIMPL
-114	UNIMPL
+106	UNIMPL		nfssys
+107	UNIMPL		waitsys
+108	UNIMPL		sigsendsys
+109	UNIMPL		hrtsys
+110	UNIMPL		acancel
+111	UNIMPL		async
+112	UNIMPL		priocntlsys
+113	UNIMPL		pathconf
+114	UNIMPL		mincore
 115	STD		{ ibcs2_caddr_t|ibcs2_sys||mmap(ibcs2_caddr_t addr, \
 			ibcs2_size_t len, int prot, int flags, int fd, \
 			ibcs2_off_t off); }
 116 NOARGS  { int|sys||mprotect(void *addr, int len, int prot); }
 117 NOARGS  { int|sys||munmap(void *addr, int len); }
-118	UNIMPL
+118	UNIMPL		fpathconf
 119	UNIMPL		vfork
 120	NOARGS		{ int|sys||fchdir(int fd); }
 121	NOARGS		{ int|sys||readv(int fd, struct iovec *iovp, u_int iovcnt); }
@@ -221,8 +223,8 @@
 123	UNIMPL		xstat
 124	UNIMPL		lxstat
 125	UNIMPL		fxstat
-126	UNIMPL
-127	UNIMPL
+126	UNIMPL		xmknod
+127	UNIMPL		clocal
 128	UNIMPL		setrlimit
 129	UNIMPL		getrlimit
 130	UNIMPL		lchown
@@ -231,12 +233,12 @@
 int attr, int mask); }
 132	UNIMPL		getpmsg
 133	UNIMPL		putpmsg
-134	UNIMPL
-135	UNIMPL
+134	UNIMPL		rename
+135	UNIMPL		uname
 136	UNIMPL		setegid
-137	UNIMPL
+137	UNIMPL		sysconfig
 138	UNIMPL		adjtime
-139	UNIMPL
+139	UNIMPL		systeminfo
 140	UNIMPL
 141	UNIMPL		seteuid
 142	UNIMPL

CVS commit: src/sys

2010-07-22 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Fri Jul 23 02:23:59 UTC 2010

Modified Files:
src/sys/arch/x86/pci: ichlpcib.c pchbvar.h
src/sys/dev/ic: i82801lpcreg.h

Log Message:
Finish cleaning up pchb from recent change.
Use fewer magic numbers in ichlpcib.
Slightly improve style conformance.
Update paths in cpp re-inclusion guards.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/pci/pchbvar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/i82801lpcreg.h

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

Modified files:

Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.25 src/sys/arch/x86/pci/ichlpcib.c:1.26
--- src/sys/arch/x86/pci/ichlpcib.c:1.25	Fri Jul 23 00:43:21 2010
+++ src/sys/arch/x86/pci/ichlpcib.c	Fri Jul 23 02:23:58 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichlpcib.c,v 1.25 2010/07/23 00:43:21 jakllsch Exp $	*/
+/*	$NetBSD: ichlpcib.c,v 1.26 2010/07/23 02:23:58 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.25 2010/07/23 00:43:21 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.26 2010/07/23 02:23:58 jakllsch Exp $");
 
 #include 
 #include 
@@ -1241,10 +1241,11 @@
 static void
 lpcib_fwh_configure(device_t self)
 {
-	struct lpcib_softc *sc = device_private(self);
-
+	struct lpcib_softc *sc;
 	pcireg_t pr;
 
+	sc = device_private(self);
+
 	if (sc->sc_has_rcba) {
 		/*
 		 * Very unlikely to find a 82802 on a ICH6 or newer.
@@ -1254,15 +1255,16 @@
 	} else {
 		/* Enable FWH write to identify FWH. */
 		pr = pci_conf_read(sc->sc_pcib.sc_pc, sc->sc_pcib.sc_tag,
-		0x4c);
+		LPCIB_PCI_BIOS_CNTL);
 		pci_conf_write(sc->sc_pcib.sc_pc, sc->sc_pcib.sc_tag,
-		0x4c, pr|__BIT(16));
+		LPCIB_PCI_BIOS_CNTL, pr|LPCIB_PCI_BIOS_CNTL_BWE);
 	}
 
 	sc->sc_fwhbus = config_found_ia(self, "fwhichbus", NULL, NULL);
 
-	/* disable write */
-	pci_conf_write(sc->sc_pcib.sc_pc, sc->sc_pcib.sc_tag, 0x4c, pr);
+	/* restore previous write enable setting */
+	pci_conf_write(sc->sc_pcib.sc_pc, sc->sc_pcib.sc_tag,
+	LPCIB_PCI_BIOS_CNTL, pr);
 }
 
 static int

Index: src/sys/arch/x86/pci/pchbvar.h
diff -u src/sys/arch/x86/pci/pchbvar.h:1.6 src/sys/arch/x86/pci/pchbvar.h:1.7
--- src/sys/arch/x86/pci/pchbvar.h:1.6	Fri Jul 23 00:43:21 2010
+++ src/sys/arch/x86/pci/pchbvar.h	Fri Jul 23 02:23:58 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pchbvar.h,v 1.6 2010/07/23 00:43:21 jakllsch Exp $	*/
+/*	$NetBSD: pchbvar.h,v 1.7 2010/07/23 02:23:58 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -29,11 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_PCI_PCHBVAR_H_
-#define	_I386_PCI_PCHBVAR_H_
-
-#include 
-#include 
+#ifndef _X86_PCI_PCHBVAR_H_
+#define _X86_PCI_PCHBVAR_H_
 
 struct pchb_softc {
 	device_t sc_dev;
@@ -44,7 +41,4 @@
 	pcireg_t sc_pciconfext[48];
 };
 
-void	pchb_attach_rnd(struct pchb_softc *, struct pci_attach_args *);
-void	pchb_detach_rnd(struct pchb_softc *);
-
-#endif /* _I386_PCI_PCHBVAR_H_ */
+#endif /* _X86_PCI_PCHBVAR_H_ */

Index: src/sys/dev/ic/i82801lpcreg.h
diff -u src/sys/dev/ic/i82801lpcreg.h:1.10 src/sys/dev/ic/i82801lpcreg.h:1.11
--- src/sys/dev/ic/i82801lpcreg.h:1.10	Sun Sep 27 17:55:32 2009
+++ src/sys/dev/ic/i82801lpcreg.h	Fri Jul 23 02:23:58 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: i82801lpcreg.h,v 1.10 2009/09/27 17:55:32 jakllsch Exp $	*/
+/*	$NetBSD: i82801lpcreg.h,v 1.11 2010/07/23 02:23:58 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,8 +34,8 @@
  *   register definitions.
  */
 
-#ifndef _DEV_IC_I82801LPGREG_H_
-#define _DEV_IC_I82801LPGREG_H_
+#ifndef _DEV_IC_I82801LPCREG_H_
+#define _DEV_IC_I82801LPCREG_H_
 /*
  * PCI configuration registers
  */
@@ -45,7 +45,9 @@
 /* GPIO config registers ICH6+ */
 #define LPCIB_PCI_GPIO_BASE_ICH6	0x48
 #define LPCIB_PCI_GPIO_CNTL_ICH6	0x4c
-#define LPCIB_PCI_BIOS_CNTL	0x4e
+#define LPCIB_PCI_BIOS_CNTL	0x4c /* actually 0x4e */
+#define LPCIB_PCI_BIOS_CNTL_BWE	(0x0001 << 16) /* write enable */
+#define LPCIB_PCI_BIOS_CNTL_BLE	(0x0002 << 16) /* lock enable */
 #define LPCIB_PCI_TCO_CNTL	0x54
 /* GPIO config registers ICH0-ICH5 */
 #define LPCIB_PCI_GPIO_BASE	0x58
@@ -297,4 +299,4 @@
 #define LPCIB_TCOTIMER_MAX_TICK 	0x3f 	/* 39 seconds max */
 #define LPCIB_TCOTIMER2_MAX_TICK 	0x265	/* 613 seconds max */
 
-#endif /*  _DEV_IC_I82801LPGREG_H_ */
+#endif /*  _DEV_IC_I82801LPCREG_H_ */

CVS commit: src/doc

2010-07-22 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Fri Jul 23 00:50:40 UTC 2010

Modified Files:
src/doc: CHANGES

Log Message:
Note x86/fwhrng(4) replacement for rnd(4) support in x86/pchb(4).


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

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1420 src/doc/CHANGES:1.1421
--- src/doc/CHANGES:1.1420	Sun Jul 18 12:44:09 2010
+++ src/doc/CHANGES	Fri Jul 23 00:50:39 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1420 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1421 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -692,3 +692,5 @@
 		libutil tests to ATF.  [jmmv 20100716]
 	tests: Convert the include and csu tests to ATF.  [jmmv 20100717]
 	tests: Convert the lint1 and libobjc tests to ATF.  [jmmv 20100718]
+	amd64, i386: Intel Firmware Hub Random Number Generator support moved
+		from pchb(4) to fwhrng(4) at ichlpcib(4).  [jakllsch 20100723]

CVS commit: src/sys/arch

2010-07-22 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Fri Jul 23 00:43:21 UTC 2010

Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
src/sys/arch/x86/pci: files.pci i82802reg.h ichlpcib.c pchb.c pchbvar.h
Added Files:
src/sys/arch/x86/pci: fwhrng.c
Removed Files:
src/sys/arch/x86/pci: pchb_rnd.c

Log Message:
Almost entirely rework Intel Firmware Hub random number generator support.

This introduces fwhrng(4) which attaches via ichlpcib(4), replacing
the rnd(4) support in pchb(4).


To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.987 -r1.988 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/pci/files.pci
cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/pci/fwhrng.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/pci/i82802reg.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/pci/pchb.c
cvs rdiff -u -r1.9 -r0 src/sys/arch/x86/pci/pchb_rnd.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/pci/pchbvar.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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.282 src/sys/arch/amd64/conf/GENERIC:1.283
--- src/sys/arch/amd64/conf/GENERIC:1.282	Sun Jul 18 09:29:11 2010
+++ src/sys/arch/amd64/conf/GENERIC	Fri Jul 23 00:43:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.282 2010/07/18 09:29:11 jruoho Exp $
+# $NetBSD: GENERIC,v 1.283 2010/07/23 00:43:20 jakllsch Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.282 $"
+#ident 		"GENERIC-$Revision: 1.283 $"
 
 maxusers	64		# estimated number of users
 
@@ -336,8 +336,9 @@
 #amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
 #hpet* 	at amdpcib?
 
-ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
-	# watchdog and Speedstep support.
+ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-LPC w/ timecounter,
+	# watchdog and Speedstep and HPET
+fwhrng* at ichlpcib?		# Intel 82802 FWH Random Number Generator
 #hpet* 	at ichlpcib?
 
 aapic* 	at pci? dev ? function ?	# AMD 8131 IO apic

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.987 src/sys/arch/i386/conf/GENERIC:1.988
--- src/sys/arch/i386/conf/GENERIC:1.987	Sun Jul 18 09:29:12 2010
+++ src/sys/arch/i386/conf/GENERIC	Fri Jul 23 00:43:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.987 2010/07/18 09:29:12 jruoho Exp $
+# $NetBSD: GENERIC,v 1.988 2010/07/23 00:43:20 jakllsch Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.987 $"
+#ident 		"GENERIC-$Revision: 1.988 $"
 
 maxusers	64		# estimated number of users
 
@@ -457,8 +457,9 @@
 # PCI bridges
 #amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
 #hpet* 	at amdpcib?
-ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
+ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-LPC w/ timecounter,
 	# watchdog, SpeedStep and HPET
+fwhrng* at ichlpcib?		# Intel 82802 FWH Random Number Generator
 #hpet* 	at ichlpcib?
 gcscpcib* at pci? dev ? function ?	# AMD CS5535/CS5536 PCI-ISA w/
 gpio* 	at gcscpcib?			# timecounter, watchdog and GPIO

Index: src/sys/arch/x86/pci/files.pci
diff -u src/sys/arch/x86/pci/files.pci:1.9 src/sys/arch/x86/pci/files.pci:1.10
--- src/sys/arch/x86/pci/files.pci:1.9	Fri May 14 18:11:25 2010
+++ src/sys/arch/x86/pci/files.pci	Fri Jul 23 00:43:21 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pci,v 1.9 2010/05/14 18:11:25 phx Exp $
+#	$NetBSD: files.pci,v 1.10 2010/07/23 00:43:21 jakllsch Exp $
 
 device 	aapic
 attach 	aapic at pci
@@ -11,7 +11,6 @@
 		agp_intel, agp_sis, agp_via
 attach	pchb at pci
 file	arch/x86/pci/pchb.c		pchb		needs-flag
-file	arch/x86/pci/pchb_rnd.c		pchb & rnd
 
 # PCI-ISA bridges
 device	pcib: isabus
@@ -32,9 +31,14 @@
 file	arch/x86/pci/amdtemp.c		amdtemp
 
 # PCI-LPC bridges
+define	fwhichbus {}
 define	hpetichbus {}
-device	ichlpcib: acpipmtimer, isabus, sysmon_wdog, hpetichbus, gpiobus
+device	ichlpcib: acpipmtimer, isabus, sysmon_wdog, fwhichbus, hpetichbus, gpiobus
 attach	ichlpcib at pci
 attach	hpet at hpetichbus with ichlpcib_hpet
 
 file 	arch/x86/pci/ichlpcib.c 	ichlpcib
+
+device	fwhrng
+attach	fwhrng at fwhichbus
+file	arch/x86/pci/fwhrng.c		fwhrng needs-flag

Index: src/sys/arch/x86/pci/i82802reg.h
diff -u src/sys/arch/x86/pci/i82802reg.h:1.2 src/sys/arch/x86/pci/i82802reg.h:1.3
--- src/sys/arch/x86/pci/i82802reg.h:1.2	Tue Nov  3 01:19:35 2009
+++ src/sys/arch/x86/pci/i82802reg.h	Fri Jul 23 00:43:21 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: i82802reg.h,v 1.2 2009/11/03 01:19:35 snj Exp $	*/
+/*	$NetBSD: i82802reg.h,v 1.3 2010/07/23 00:43:21 jakl

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

2010-07-22 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Thu Jul 22 21:00:07 UTC 2010

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

Log Message:
Reset l_mutex when waking up a thread.  select uses it to determine
if a thread is still selecting, and would get a KASSERT panic if
the thread had been woken up but not run yet when selnotify() was
called.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/librump/rumpkern/sleepq.c

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

Modified files:

Index: src/sys/rump/librump/rumpkern/sleepq.c
diff -u src/sys/rump/librump/rumpkern/sleepq.c:1.6 src/sys/rump/librump/rumpkern/sleepq.c:1.7
--- src/sys/rump/librump/rumpkern/sleepq.c:1.6	Tue Nov 17 15:23:42 2009
+++ src/sys/rump/librump/rumpkern/sleepq.c	Thu Jul 22 21:00:07 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: sleepq.c,v 1.6 2009/11/17 15:23:42 pooka Exp $	*/
+/*	$NetBSD: sleepq.c,v 1.7 2010/07/22 21:00:07 pooka Exp $	*/
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.6 2009/11/17 15:23:42 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.7 2010/07/22 21:00:07 pooka Exp $");
 
 #include 
 #include 
@@ -112,6 +112,7 @@
 		if (l->l_wchan == wchan) {
 			found = true;
 			l->l_wchan = NULL;
+			l->l_mutex = NULL;
 			TAILQ_REMOVE(sq, l, l_sleepchain);
 		}
 	}
@@ -127,6 +128,7 @@
 {
 
 	l->l_wchan = NULL;
+	l->l_mutex = NULL;
 	TAILQ_REMOVE(l->l_sleepq, l, l_sleepchain);
 	cv_broadcast(&sq_cv);

CVS commit: [netbsd-4] src/doc

2010-07-22 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Thu Jul 22 20:36:46 UTC 2010

Modified Files:
src/doc [netbsd-4]: CHANGES-4.1

Log Message:
Ticket 1398.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.203 -r1.1.2.204 src/doc/CHANGES-4.1

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

Modified files:

Index: src/doc/CHANGES-4.1
diff -u src/doc/CHANGES-4.1:1.1.2.203 src/doc/CHANGES-4.1:1.1.2.204
--- src/doc/CHANGES-4.1:1.1.2.203	Fri Jul 16 19:39:53 2010
+++ src/doc/CHANGES-4.1	Thu Jul 22 20:36:45 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: CHANGES-4.1,v 1.1.2.203 2010/07/16 19:39:53 riz Exp $
+#	$NetBSD: CHANGES-4.1,v 1.1.2.204 2010/07/22 20:36:45 riz Exp $
 
 A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1
 release:
@@ -4183,3 +4183,13 @@
 	was initialized.
 	[dyoung, ticket #1397]
 
+sys/netsmb/mchain.h1.9 via patch
+sys/netsmb/smb_dev.h1.7
+sys/netsmb/smb_subr.c1.35
+sys/netsmb/smb_subr.h1.19
+sys/netsmb/subr_mchain.c			1.19 via patch
+
+	Convert sizes/lengths to unsigned (size_t) or uint32_t
+	(for binary compatibility).
+	[christos, ticket #1398]
+

CVS commit: [netbsd-4] src/sys/netsmb

2010-07-22 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Thu Jul 22 20:36:23 UTC 2010

Modified Files:
src/sys/netsmb [netbsd-4]: mchain.h smb_dev.h smb_subr.c smb_subr.h
subr_mchain.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1398):
sys/netsmb/subr_mchain.c: revision 1.19 via patch
sys/netsmb/smb_subr.c: revision 1.35
sys/netsmb/smb_subr.h: revision 1.19
sys/netsmb/mchain.h: revision 1.9 via patch
sys/netsmb/smb_dev.h: revision 1.7
Convert sizes/lengths to unsigned (size_t) or uint32_t
(for binary compatibility).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.24.1 src/sys/netsmb/mchain.h
cvs rdiff -u -r1.6 -r1.6.12.1 src/sys/netsmb/smb_dev.h
cvs rdiff -u -r1.29 -r1.29.2.1 src/sys/netsmb/smb_subr.c
cvs rdiff -u -r1.16 -r1.16.6.1 src/sys/netsmb/smb_subr.h
cvs rdiff -u -r1.13 -r1.13.18.1 src/sys/netsmb/subr_mchain.c

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

Modified files:

Index: src/sys/netsmb/mchain.h
diff -u src/sys/netsmb/mchain.h:1.6 src/sys/netsmb/mchain.h:1.6.24.1
--- src/sys/netsmb/mchain.h:1.6	Sun Dec 11 00:06:21 2005
+++ src/sys/netsmb/mchain.h	Thu Jul 22 20:36:22 2010
@@ -59,8 +59,8 @@
 struct mbchain {
 	struct mbuf *	mb_top;		/* head of mbufs chain */
 	struct mbuf * 	mb_cur;		/* current mbuf */
-	int		mb_mleft;	/* free space in the current mbuf */
-	int		mb_count;	/* total number of bytes */
+	size_t		mb_mleft;	/* free space in the current mbuf */
+	size_t		mb_count;	/* total number of bytes */
 	mb_copy_t *	mb_copy;	/* user defined copy function */
 	void *		mb_udata;	/* user data */
 };
@@ -78,7 +78,7 @@
 void mb_done(struct mbchain *mbp);
 struct mbuf *mb_detach(struct mbchain *mbp);
 int  mb_fixhdr(struct mbchain *mbp);
-caddr_t mb_reserve(struct mbchain *mbp, int size);
+caddr_t mb_reserve(struct mbchain *mbp, size_t size);
 
 int  mb_put_uint8(struct mbchain *mbp, u_int8_t x);
 int  mb_put_uint16be(struct mbchain *mbp, u_int16_t x);
@@ -87,9 +87,9 @@
 int  mb_put_uint32le(struct mbchain *mbp, u_int32_t x);
 int  mb_put_int64be(struct mbchain *mbp, int64_t x);
 int  mb_put_int64le(struct mbchain *mbp, int64_t x);
-int  mb_put_mem(struct mbchain *mbp, const char * source, int size, int type);
+int  mb_put_mem(struct mbchain *mbp, const char * source, size_t size, int type);
 int  mb_put_mbuf(struct mbchain *mbp, struct mbuf *m);
-int  mb_put_uio(struct mbchain *mbp, struct uio *uiop, int size);
+int  mb_put_uio(struct mbchain *mbp, struct uio *uiop, size_t size);
 
 int  md_init(struct mdchain *mdp);
 void md_initm(struct mdchain *mbp, struct mbuf *m);
@@ -106,9 +106,9 @@
 int  md_get_int64(struct mdchain *mdp, int64_t *x);
 int  md_get_int64be(struct mdchain *mdp, int64_t *x);
 int  md_get_int64le(struct mdchain *mdp, int64_t *x);
-int  md_get_mem(struct mdchain *mdp, caddr_t target, int size, int type);
+int  md_get_mem(struct mdchain *mdp, caddr_t target, size_t size, int type);
 int  md_get_mbuf(struct mdchain *mdp, int size, struct mbuf **m);
-int  md_get_uio(struct mdchain *mdp, struct uio *uiop, int size);
+int  md_get_uio(struct mdchain *mdp, struct uio *uiop, size_t size);
 
 #endif	/* ifdef _KERNEL */
 

Index: src/sys/netsmb/smb_dev.h
diff -u src/sys/netsmb/smb_dev.h:1.6 src/sys/netsmb/smb_dev.h:1.6.12.1
--- src/sys/netsmb/smb_dev.h:1.6	Sun May 14 21:20:13 2006
+++ src/sys/netsmb/smb_dev.h	Thu Jul 22 20:36:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_dev.h,v 1.6 2006/05/14 21:20:13 elad Exp $	*/
+/*	$NetBSD: smb_dev.h,v 1.6.12.1 2010/07/22 20:36:22 riz Exp $	*/
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -67,9 +67,9 @@
 
 struct smbioc_ossn {
 	int		ioc_opt;
-	int		ioc_svlen;	/* size of ioc_server address */
+	uint32_t	ioc_svlen;	/* size of ioc_server address */
 	struct sockaddr*ioc_server;
-	int		ioc_lolen;	/* size of ioc_local address */
+	uint32_t	ioc_lolen;	/* size of ioc_local address */
 	struct sockaddr*ioc_local;
 	char		ioc_srvname[SMB_MAXSRVNAMELEN + 1];
 	int		ioc_timeout;

Index: src/sys/netsmb/smb_subr.c
diff -u src/sys/netsmb/smb_subr.c:1.29 src/sys/netsmb/smb_subr.c:1.29.2.1
--- src/sys/netsmb/smb_subr.c:1.29	Thu Nov 16 01:33:51 2006
+++ src/sys/netsmb/smb_subr.c	Thu Jul 22 20:36:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_subr.c,v 1.29 2006/11/16 01:33:51 christos Exp $	*/
+/*	$NetBSD: smb_subr.c,v 1.29.2.1 2010/07/22 20:36:22 riz Exp $	*/
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: smb_subr.c,v 1.29 2006/11/16 01:33:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_subr.c,v 1.29.2.1 2010/07/22 20:36:22 riz Exp $");
 
 #include 
 #include 
@@ -93,7 +93,7 @@
 smb_strdup(const char *s)
 {
 	char *p;
-	int len;
+	size_t len;
 
 	len = s ? strlen(s) + 1 : 1;
 	p = malloc(len, M_SMBSTR, M_WAITOK);
@@ -108,10 +108,10 @@
  * duplicate string from a user space.
  */
 char *
-smb_strdupin(char *s, int maxlen)
+smb_strdupin(ch

CVS commit: [netbsd-4-0] src/doc

2010-07-22 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Thu Jul 22 20:36:13 UTC 2010

Modified Files:
src/doc [netbsd-4-0]: CHANGES-4.0.2

Log Message:
Ticket 1398.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.72 -r1.1.2.73 src/doc/CHANGES-4.0.2

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

Modified files:

Index: src/doc/CHANGES-4.0.2
diff -u src/doc/CHANGES-4.0.2:1.1.2.72 src/doc/CHANGES-4.0.2:1.1.2.73
--- src/doc/CHANGES-4.0.2:1.1.2.72	Fri Jul 16 19:42:00 2010
+++ src/doc/CHANGES-4.0.2	Thu Jul 22 20:36:12 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: CHANGES-4.0.2,v 1.1.2.72 2010/07/16 19:42:00 riz Exp $
+#	$NetBSD: CHANGES-4.0.2,v 1.1.2.73 2010/07/22 20:36:12 riz Exp $
 
 A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2
 release:
@@ -1045,3 +1045,13 @@
 	was initialized.
 	[dyoung, ticket #1397]
 
+sys/netsmb/mchain.h1.9 via patch
+sys/netsmb/smb_dev.h1.7
+sys/netsmb/smb_subr.c1.35
+sys/netsmb/smb_subr.h1.19
+sys/netsmb/subr_mchain.c			1.19 via patch
+
+	Convert sizes/lengths to unsigned (size_t) or uint32_t
+	(for binary compatibility).
+	[christos, ticket #1398]
+

CVS commit: [netbsd-4-0] src/sys/netsmb

2010-07-22 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Thu Jul 22 20:34:17 UTC 2010

Modified Files:
src/sys/netsmb [netbsd-4-0]: mchain.h smb_dev.h smb_subr.c smb_subr.h
subr_mchain.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1398):
sys/netsmb/subr_mchain.c: revision 1.19 via patch
sys/netsmb/smb_subr.c: revision 1.35
sys/netsmb/smb_subr.h: revision 1.19
sys/netsmb/mchain.h: revision 1.9 via patch
sys/netsmb/smb_dev.h: revision 1.7
Convert sizes/lengths to unsigned (size_t) or uint32_t
(for binary compatibility).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.34.1 src/sys/netsmb/mchain.h
cvs rdiff -u -r1.6 -r1.6.52.1 src/sys/netsmb/smb_dev.h
cvs rdiff -u -r1.29 -r1.29.8.1 src/sys/netsmb/smb_subr.c
cvs rdiff -u -r1.16 -r1.16.46.1 src/sys/netsmb/smb_subr.h
cvs rdiff -u -r1.13 -r1.13.28.1 src/sys/netsmb/subr_mchain.c

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

Modified files:

Index: src/sys/netsmb/mchain.h
diff -u src/sys/netsmb/mchain.h:1.6 src/sys/netsmb/mchain.h:1.6.34.1
--- src/sys/netsmb/mchain.h:1.6	Sun Dec 11 00:06:21 2005
+++ src/sys/netsmb/mchain.h	Thu Jul 22 20:34:17 2010
@@ -59,8 +59,8 @@
 struct mbchain {
 	struct mbuf *	mb_top;		/* head of mbufs chain */
 	struct mbuf * 	mb_cur;		/* current mbuf */
-	int		mb_mleft;	/* free space in the current mbuf */
-	int		mb_count;	/* total number of bytes */
+	size_t		mb_mleft;	/* free space in the current mbuf */
+	size_t		mb_count;	/* total number of bytes */
 	mb_copy_t *	mb_copy;	/* user defined copy function */
 	void *		mb_udata;	/* user data */
 };
@@ -78,7 +78,7 @@
 void mb_done(struct mbchain *mbp);
 struct mbuf *mb_detach(struct mbchain *mbp);
 int  mb_fixhdr(struct mbchain *mbp);
-caddr_t mb_reserve(struct mbchain *mbp, int size);
+caddr_t mb_reserve(struct mbchain *mbp, size_t size);
 
 int  mb_put_uint8(struct mbchain *mbp, u_int8_t x);
 int  mb_put_uint16be(struct mbchain *mbp, u_int16_t x);
@@ -87,9 +87,9 @@
 int  mb_put_uint32le(struct mbchain *mbp, u_int32_t x);
 int  mb_put_int64be(struct mbchain *mbp, int64_t x);
 int  mb_put_int64le(struct mbchain *mbp, int64_t x);
-int  mb_put_mem(struct mbchain *mbp, const char * source, int size, int type);
+int  mb_put_mem(struct mbchain *mbp, const char * source, size_t size, int type);
 int  mb_put_mbuf(struct mbchain *mbp, struct mbuf *m);
-int  mb_put_uio(struct mbchain *mbp, struct uio *uiop, int size);
+int  mb_put_uio(struct mbchain *mbp, struct uio *uiop, size_t size);
 
 int  md_init(struct mdchain *mdp);
 void md_initm(struct mdchain *mbp, struct mbuf *m);
@@ -106,9 +106,9 @@
 int  md_get_int64(struct mdchain *mdp, int64_t *x);
 int  md_get_int64be(struct mdchain *mdp, int64_t *x);
 int  md_get_int64le(struct mdchain *mdp, int64_t *x);
-int  md_get_mem(struct mdchain *mdp, caddr_t target, int size, int type);
+int  md_get_mem(struct mdchain *mdp, caddr_t target, size_t size, int type);
 int  md_get_mbuf(struct mdchain *mdp, int size, struct mbuf **m);
-int  md_get_uio(struct mdchain *mdp, struct uio *uiop, int size);
+int  md_get_uio(struct mdchain *mdp, struct uio *uiop, size_t size);
 
 #endif	/* ifdef _KERNEL */
 

Index: src/sys/netsmb/smb_dev.h
diff -u src/sys/netsmb/smb_dev.h:1.6 src/sys/netsmb/smb_dev.h:1.6.52.1
--- src/sys/netsmb/smb_dev.h:1.6	Sun May 14 21:20:13 2006
+++ src/sys/netsmb/smb_dev.h	Thu Jul 22 20:34:17 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_dev.h,v 1.6 2006/05/14 21:20:13 elad Exp $	*/
+/*	$NetBSD: smb_dev.h,v 1.6.52.1 2010/07/22 20:34:17 riz Exp $	*/
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -67,9 +67,9 @@
 
 struct smbioc_ossn {
 	int		ioc_opt;
-	int		ioc_svlen;	/* size of ioc_server address */
+	uint32_t	ioc_svlen;	/* size of ioc_server address */
 	struct sockaddr*ioc_server;
-	int		ioc_lolen;	/* size of ioc_local address */
+	uint32_t	ioc_lolen;	/* size of ioc_local address */
 	struct sockaddr*ioc_local;
 	char		ioc_srvname[SMB_MAXSRVNAMELEN + 1];
 	int		ioc_timeout;

Index: src/sys/netsmb/smb_subr.c
diff -u src/sys/netsmb/smb_subr.c:1.29 src/sys/netsmb/smb_subr.c:1.29.8.1
--- src/sys/netsmb/smb_subr.c:1.29	Thu Nov 16 01:33:51 2006
+++ src/sys/netsmb/smb_subr.c	Thu Jul 22 20:34:16 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_subr.c,v 1.29 2006/11/16 01:33:51 christos Exp $	*/
+/*	$NetBSD: smb_subr.c,v 1.29.8.1 2010/07/22 20:34:16 riz Exp $	*/
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: smb_subr.c,v 1.29 2006/11/16 01:33:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_subr.c,v 1.29.8.1 2010/07/22 20:34:16 riz Exp $");
 
 #include 
 #include 
@@ -93,7 +93,7 @@
 smb_strdup(const char *s)
 {
 	char *p;
-	int len;
+	size_t len;
 
 	len = s ? strlen(s) + 1 : 1;
 	p = malloc(len, M_SMBSTR, M_WAITOK);
@@ -108,10 +108,10 @@
  * duplicate string from a user space.
  */
 char *
-smb_strdupin(char *s, int maxlen)
+smb_strdupin

CVS commit: src/lib/libc/sys

2010-07-22 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Jul 22 19:28:25 UTC 2010

Modified Files:
src/lib/libc/sys: pathconf.2

Log Message:
Bump date for _PC_NO_TRUNC description fix.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/sys/pathconf.2

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

Modified files:

Index: src/lib/libc/sys/pathconf.2
diff -u src/lib/libc/sys/pathconf.2:1.25 src/lib/libc/sys/pathconf.2:1.26
--- src/lib/libc/sys/pathconf.2:1.25	Thu Jul 22 18:20:21 2010
+++ src/lib/libc/sys/pathconf.2	Thu Jul 22 19:28:25 2010
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pathconf.2,v 1.25 2010/07/22 18:20:21 njoly Exp $
+.\"	$NetBSD: pathconf.2,v 1.26 2010/07/22 19:28:25 wiz Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)pathconf.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd April 22, 2010
+.Dd July 22, 2010
 .Dt PATHCONF 2
 .Os
 .Sh NAME

CVS commit: src/share/man/man4

2010-07-22 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Jul 22 19:27:51 UTC 2010

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

Log Message:
Add comma in enumeration.


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

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

Modified files:

Index: src/share/man/man4/swwdog.4
diff -u src/share/man/man4/swwdog.4:1.5 src/share/man/man4/swwdog.4:1.6
--- src/share/man/man4/swwdog.4:1.5	Thu Jul 22 14:10:14 2010
+++ src/share/man/man4/swwdog.4	Thu Jul 22 19:27:51 2010
@@ -1,4 +1,4 @@
-.\"	$NetBSD: swwdog.4,v 1.5 2010/07/22 14:10:14 pgoyette Exp $
+.\"	$NetBSD: swwdog.4,v 1.6 2010/07/22 19:27:51 wiz Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Steven M. Bellovin
 .\" All rights reserved.
@@ -64,7 +64,7 @@
 .Nm
 driver prevents a system from suspending when the watchdog is armed.
 .Sh SEE ALSO
-.Xr sysctl 8
+.Xr sysctl 8 ,
 .Xr wdogctl 8
 .Sh HISTORY
 The

CVS commit: src/lib/libc/sys

2010-07-22 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Thu Jul 22 18:20:21 UTC 2010

Modified Files:
src/lib/libc/sys: pathconf.2

Log Message:
Fix wrong value (1 -> 0) in _PC_NO_TRUNC description.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/sys/pathconf.2

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

Modified files:

Index: src/lib/libc/sys/pathconf.2
diff -u src/lib/libc/sys/pathconf.2:1.24 src/lib/libc/sys/pathconf.2:1.25
--- src/lib/libc/sys/pathconf.2:1.24	Mon May 31 12:16:20 2010
+++ src/lib/libc/sys/pathconf.2	Thu Jul 22 18:20:21 2010
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pathconf.2,v 1.24 2010/05/31 12:16:20 njoly Exp $
+.\"	$NetBSD: pathconf.2,v 1.25 2010/07/22 18:20:21 njoly Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -93,7 +93,7 @@
 .Xr chown 2
 system call, otherwise 0.
 .It Li _PC_NO_TRUNC
-Return 1 if filenames longer than
+Return 0 if filenames longer than
 .Brq Dv NAME_MAX
 are truncated.
 .It Li _PC_VDISABLE

CVS commit: src/sys/fs/msdosfs

2010-07-22 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Thu Jul 22 18:08:12 UTC 2010

Modified Files:
src/sys/fs/msdosfs: msdosfs_vnops.c

Log Message:
Remove bad cast, fix compilation with MSDOSFS_DEBUG.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/fs/msdosfs/msdosfs_vnops.c

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

Modified files:

Index: src/sys/fs/msdosfs/msdosfs_vnops.c
diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.67 src/sys/fs/msdosfs/msdosfs_vnops.c:1.68
--- src/sys/fs/msdosfs/msdosfs_vnops.c:1.67	Thu Jun 24 13:03:09 2010
+++ src/sys/fs/msdosfs/msdosfs_vnops.c	Thu Jul 22 18:08:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_vnops.c,v 1.67 2010/06/24 13:03:09 hannken Exp $	*/
+/*	$NetBSD: msdosfs_vnops.c,v 1.68 2010/07/22 18:08:11 njoly Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.67 2010/06/24 13:03:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.68 2010/07/22 18:08:11 njoly Exp $");
 
 #include 
 #include 
@@ -358,7 +358,7 @@
 		vap->va_type, vap->va_nlink, vap->va_fsid,
 		(unsigned long long)vap->va_fileid);
 		printf("va_blocksize %lx, va_rdev %"PRIx64", va_bytes %"PRIx64", va_gen %lx\n",
-		vap->va_blocksize, vap->va_rdev, (long long)vap->va_bytes, vap->va_gen);
+		vap->va_blocksize, vap->va_rdev, vap->va_bytes, vap->va_gen);
 #endif
 		return (EINVAL);
 	}

CVS commit: src/sys/dev/acpi

2010-07-22 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Thu Jul 22 16:35:24 UTC 2010

Modified Files:
src/sys/dev/acpi: com_acpi.c

Log Message:
Even if there's an error in attaching the device (failure to find IRQ
resource, or I/O mapping), set-up a power management handler so we can
sleep later on.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/com_acpi.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/acpi/com_acpi.c
diff -u src/sys/dev/acpi/com_acpi.c:1.31 src/sys/dev/acpi/com_acpi.c:1.32
--- src/sys/dev/acpi/com_acpi.c:1.31	Fri Mar  5 14:00:17 2010
+++ src/sys/dev/acpi/com_acpi.c	Thu Jul 22 16:35:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: com_acpi.c,v 1.31 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: com_acpi.c,v 1.32 2010/07/22 16:35:24 pgoyette Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill 
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.31 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.32 2010/07/22 16:35:24 pgoyette Exp $");
 
 #include 
 #include 
@@ -157,7 +157,16 @@
 
 	if (!pmf_device_register(self, NULL, com_resume))
 		aprint_error_dev(self, "couldn't establish a power handler\n");
+	goto cleanup;
 
+	/*
+	 * In case of irq resource or i/o space mapping error, just set
+	 * a NULL power handler.  This may allow us to sleep later on.
+	 */
  out:
+	if (!pmf_device_register(self, NULL, NULL))
+		aprint_error_dev(self, "couldn't establish a power handler\n");
+
+ cleanup:
 	acpi_resource_cleanup(&res);
 }

CVS commit: src

2010-07-22 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Thu Jul 22 14:10:15 UTC 2010

Modified Files:
src/share/man/man4: swwdog.4
src/sys/dev/sysmon: files.sysmon swwdog.c
src/sys/rump/dev/lib/libsysmon: Makefile
Added Files:
src/sys/rump/dev/lib/libsysmon: SYSMON.ioconf

Log Message:
Convert swwdog(4) from a simple defpseudo device to a defpseudodev so
that we can attach a power management handler.  The handler prevents
a suspend if the watchdog is active, to be consistent with other
watchdog drivers.

As discussed on tech-kern.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/swwdog.4
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/sysmon/files.sysmon
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/sysmon/swwdog.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libsysmon/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libsysmon/SYSMON.ioconf

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

Modified files:

Index: src/share/man/man4/swwdog.4
diff -u src/share/man/man4/swwdog.4:1.4 src/share/man/man4/swwdog.4:1.5
--- src/share/man/man4/swwdog.4:1.4	Sat Jan 30 21:55:28 2010
+++ src/share/man/man4/swwdog.4	Thu Jul 22 14:10:14 2010
@@ -1,4 +1,4 @@
-.\"	$NetBSD: swwdog.4,v 1.4 2010/01/30 21:55:28 pooka Exp $
+.\"	$NetBSD: swwdog.4,v 1.5 2010/07/22 14:10:14 pgoyette Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Steven M. Bellovin
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 30, 2010
+.Dd July 21, 2010
 .\" Written by Steven M. Bellovin
 .Dt SWWDOG 4
 .Os
@@ -45,14 +45,26 @@
 .Nm
 driver provides a software watchdog timer that works with
 .Xr wdogctl 8 .
-If the timer expires, the system reboots unless the variable
+If the timer expires, the system reboots unless the boolean variable
 .Va swwdog_panic
-is non-zero; if it is, the system will panic instead.
+is
+.Dv true ;
+if it is, the system will panic instead.
+.Va swwdog_reboot
+is accessible as a
+.Xr sysctl 8
+variable, machdep.swwdog0.reboot and defaults to
+.Dv false .
 .Pp
 The default period of
 .Nm
 is 60 seconds.
+.Pp
+As with other watchdog timers, the
+.Nm
+driver prevents a system from suspending when the watchdog is armed.
 .Sh SEE ALSO
+.Xr sysctl 8
 .Xr wdogctl 8
 .Sh HISTORY
 The
@@ -61,7 +73,10 @@
 .An Steven M. Bellovin .
 .Sh BUGS
 Only one watchdog timer can be active at any given time.
-Arguably, this is a bug in the watchdog timer framework.
+(Arguably, this is a bug in the watchdog timer framework.)
+Therefore, only a single instance of the
+.Nm
+device can be created.
 .Pp
 Kernel tickle mode is useless with
 .Nm

Index: src/sys/dev/sysmon/files.sysmon
diff -u src/sys/dev/sysmon/files.sysmon:1.11 src/sys/dev/sysmon/files.sysmon:1.12
--- src/sys/dev/sysmon/files.sysmon:1.11	Sat Jan 30 21:55:28 2010
+++ src/sys/dev/sysmon/files.sysmon	Thu Jul 22 14:10:15 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sysmon,v 1.11 2010/01/30 21:55:28 pooka Exp $
+#	$NetBSD: files.sysmon,v 1.12 2010/07/22 14:10:15 pgoyette Exp $
 
 define	sysmon_taskq
 file	dev/sysmon/sysmon_taskq.c	sysmon_taskq 		needs-flag
@@ -18,5 +18,5 @@
 file	dev/sysmon/sysmon.c		sysmon_envsys | sysmon_wdog |
 	sysmon_power
 
-defpseudo swwdog: sysmon_wdog
+defpseudodev swwdog: sysmon_wdog
 filedev/sysmon/swwdog.cswwdog

Index: src/sys/dev/sysmon/swwdog.c
diff -u src/sys/dev/sysmon/swwdog.c:1.9 src/sys/dev/sysmon/swwdog.c:1.10
--- src/sys/dev/sysmon/swwdog.c:1.9	Sun Jan 31 02:54:56 2010
+++ src/sys/dev/sysmon/swwdog.c	Thu Jul 22 14:10:15 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: swwdog.c,v 1.9 2010/01/31 02:54:56 pooka Exp $	*/
+/*	$NetBSD: swwdog.c,v 1.10 2010/07/22 14:10:15 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Steven M. Bellovin
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.9 2010/01/31 02:54:56 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.10 2010/07/22 14:10:15 pgoyette Exp $");
 
 /*
  *
@@ -44,20 +44,28 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
-#define NSWWDOG 1
+#include "ioconf.h"
+
 struct swwdog_softc {
+	device_t sc_dev;
 	struct sysmon_wdog sc_smw;
 	struct callout sc_c;
-	char sc_name[20];
 	int sc_wdog_armed;
-} sc_wdog[NSWWDOG];
+};
+
+void		swwdogattach(int);
 
-void	swwdogattach(int);
+static int	swwdog_match(device_t, cfdata_t, void *);
+static void	swwdog_attach(device_t, device_t, void *);
+static int	swwdog_detach(device_t, int);
+static bool	swwdog_suspend(device_t, const pmf_qual_t *);
 
 static int swwdog_setmode(struct sysmon_wdog *);
 static int swwdog_tickle(struct sysmon_wdog *);
@@ -67,34 +75,87 @@
 
 static void swwdog_panic(void *);
 
-int swwdog_reboot = 0;		/* set for panic instead of reboot */
+bool swwdog_reboot = false;		/* set for panic instead of reboot */
 
 #define	SWDOG_DEFAULT	60

CVS commit: src/sys/dev/wsfont

2010-07-22 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Thu Jul 22 13:23:03 UTC 2010

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

Log Message:
In wsfont_rotate_cw_internal() and wsfont_rotate_ccw_internal(),
give a new name to rotated fonts so that 8x8 (and other X==Y) fonts
can be used properly on CW and CCW screens.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/wsfont/wsfont.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/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.49 src/sys/dev/wsfont/wsfont.c:1.50
--- src/sys/dev/wsfont/wsfont.c:1.49	Thu Jul 22 12:52:59 2010
+++ src/sys/dev/wsfont/wsfont.c	Thu Jul 22 13:23:02 2010
@@ -1,4 +1,4 @@
-/* 	$NetBSD: wsfont.c,v 1.49 2010/07/22 12:52:59 tsutsui Exp $	*/
+/* 	$NetBSD: wsfont.c,v 1.50 2010/07/22 13:23:02 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.49 2010/07/22 12:52:59 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.50 2010/07/22 13:23:02 tsutsui Exp $");
 
 #include "opt_wsfont.h"
 
@@ -314,9 +314,9 @@
 struct wsdisplay_font *
 wsfont_rotate_cw_internal(struct wsdisplay_font *font)
 {
-	int b, n, r, newstride;
+	int b, n, r, namelen, newstride;
 	struct wsdisplay_font *newfont;
-	char *newbits;
+	char *newname, *newbits;
 
 	/* Duplicate the existing font... */
 	newfont = malloc(sizeof(*font), M_DEVBUF, M_WAITOK);
@@ -325,6 +325,12 @@
 
 	*newfont = *font;
 
+	namelen = strlen(font->name) + 4;
+	newname = malloc(namelen, M_DEVBUF, M_WAITOK);
+	strlcpy(newname, font->name, namelen);
+	strlcat(newname, "cw", namelen);
+	newfont->name = newname;
+
 	/* Allocate a buffer big enough for the rotated font. */
 	newstride = (font->fontheight + 7) / 8;
 	newbits = malloc(newstride * font->fontwidth * font->numchars,
@@ -379,9 +385,9 @@
 struct wsdisplay_font *
 wsfont_rotate_ccw_internal(struct wsdisplay_font *font)
 {
-	int b, n, r, newstride;
+	int b, n, r, namelen, newstride;
 	struct wsdisplay_font *newfont;
-	char *newbits;
+	char *newname, *newbits;
 
 	/* Duplicate the existing font... */
 	newfont = malloc(sizeof(*font), M_DEVBUF, M_WAITOK);
@@ -390,6 +396,12 @@
 
 	*newfont = *font;
 
+	namelen = strlen(font->name) + 4;
+	newname = malloc(namelen, M_DEVBUF, M_WAITOK);
+	strlcpy(newname, font->name, namelen);
+	strlcat(newname, "ccw", namelen);
+	newfont->name = newname;
+
 	/* Allocate a buffer big enough for the rotated font. */
 	newstride = (font->fontheight + 7) / 8;
 	newbits = malloc(newstride * font->fontwidth * font->numchars,

CVS commit: src/sys/dev/wsfont

2010-07-22 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Thu Jul 22 12:52:59 UTC 2010

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

Log Message:
Umm, revert unintended changes.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/wsfont/wsfont.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/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.48 src/sys/dev/wsfont/wsfont.c:1.49
--- src/sys/dev/wsfont/wsfont.c:1.48	Thu Jul 22 12:48:00 2010
+++ src/sys/dev/wsfont/wsfont.c	Thu Jul 22 12:52:59 2010
@@ -1,4 +1,4 @@
-/* 	$NetBSD: wsfont.c,v 1.48 2010/07/22 12:48:00 tsutsui Exp $	*/
+/* 	$NetBSD: wsfont.c,v 1.49 2010/07/22 12:52:59 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.48 2010/07/22 12:48:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.49 2010/07/22 12:52:59 tsutsui Exp $");
 
 #include "opt_wsfont.h"
 
@@ -379,9 +379,9 @@
 struct wsdisplay_font *
 wsfont_rotate_ccw_internal(struct wsdisplay_font *font)
 {
-	int b, n, r, namelen, newstride;
+	int b, n, r, newstride;
 	struct wsdisplay_font *newfont;
-	char *newname, *newbits;
+	char *newbits;
 
 	/* Duplicate the existing font... */
 	newfont = malloc(sizeof(*font), M_DEVBUF, M_WAITOK);
@@ -390,12 +390,6 @@
 
 	*newfont = *font;
 
-	namelen = strlen(font->name) + 4;
-	newname = malloc(namelen, M_DEVBUF, M_WAITOK);
-	strlcpy(newname, font->name, namelen);
-	strlcat(newname, "_ccw", namelen);
-	newfont->name = newname;
-
 	/* Allocate a buffer big enough for the rotated font. */
 	newstride = (font->fontheight + 7) / 8;
 	newbits = malloc(newstride * font->fontwidth * font->numchars,

CVS commit: src/sys/dev/wsfont

2010-07-22 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Thu Jul 22 12:48:00 UTC 2010

Modified Files:
src/sys/dev/wsfont: files.wsfont wsfont.c
Added Files:
src/sys/dev/wsfont: vt220iso8x8.h

Log Message:
Add VT220 8x8 font with ISO-8859-1 chars which is converted from
sys/arch/atari/dev/font_8x8.c.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/wsfont/files.wsfont
cvs rdiff -u -r0 -r1.1 src/sys/dev/wsfont/vt220iso8x8.h
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/wsfont/wsfont.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/wsfont/files.wsfont
diff -u src/sys/dev/wsfont/files.wsfont:1.15 src/sys/dev/wsfont/files.wsfont:1.16
--- src/sys/dev/wsfont/files.wsfont:1.15	Fri Feb  2 02:10:24 2007
+++ src/sys/dev/wsfont/files.wsfont	Thu Jul 22 12:48:00 2010
@@ -1,4 +1,4 @@
-# 	$NetBSD: files.wsfont,v 1.15 2007/02/02 02:10:24 ober Exp $
+# 	$NetBSD: files.wsfont,v 1.16 2010/07/22 12:48:00 tsutsui Exp $
 
 defpseudo wsfont
 
@@ -14,6 +14,7 @@
 FONT_VT220L8x8
 FONT_VT220L8x10
 FONT_VT220L8x16
+FONT_VT220ISO8x8
 FONT_VT220ISO8x16
 FONT_VT220KOI8x10_KOI8_R
 FONT_VT220KOI8x10_KOI8_U

Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.47 src/sys/dev/wsfont/wsfont.c:1.48
--- src/sys/dev/wsfont/wsfont.c:1.47	Tue May  4 04:53:59 2010
+++ src/sys/dev/wsfont/wsfont.c	Thu Jul 22 12:48:00 2010
@@ -1,4 +1,4 @@
-/* 	$NetBSD: wsfont.c,v 1.47 2010/05/04 04:53:59 macallan Exp $	*/
+/* 	$NetBSD: wsfont.c,v 1.48 2010/07/22 12:48:00 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.47 2010/05/04 04:53:59 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.48 2010/07/22 12:48:00 tsutsui Exp $");
 
 #include "opt_wsfont.h"
 
@@ -78,6 +78,11 @@
 #include 
 #endif
 
+#ifdef FONT_VT220ISO8x8
+#define HAVE_FONT 1
+#include 
+#endif
+
 #ifdef FONT_VT220ISO8x16
 #define HAVE_FONT 1
 #include 
@@ -169,6 +174,9 @@
 #ifdef FONT_VT220L8x16
 	{ { NULL, NULL }, &vt220l8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
 #endif
+#ifdef FONT_VT220ISO8x8
+	{ { NULL, NULL }, &vt220iso8x8, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
 #ifdef FONT_VT220ISO8x16
 	{ { NULL, NULL }, &vt220iso8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
 #endif
@@ -371,9 +379,9 @@
 struct wsdisplay_font *
 wsfont_rotate_ccw_internal(struct wsdisplay_font *font)
 {
-	int b, n, r, newstride;
+	int b, n, r, namelen, newstride;
 	struct wsdisplay_font *newfont;
-	char *newbits;
+	char *newname, *newbits;
 
 	/* Duplicate the existing font... */
 	newfont = malloc(sizeof(*font), M_DEVBUF, M_WAITOK);
@@ -382,6 +390,12 @@
 
 	*newfont = *font;
 
+	namelen = strlen(font->name) + 4;
+	newname = malloc(namelen, M_DEVBUF, M_WAITOK);
+	strlcpy(newname, font->name, namelen);
+	strlcat(newname, "_ccw", namelen);
+	newfont->name = newname;
+
 	/* Allocate a buffer big enough for the rotated font. */
 	newstride = (font->fontheight + 7) / 8;
 	newbits = malloc(newstride * font->fontwidth * font->numchars,

Added files:

Index: src/sys/dev/wsfont/vt220iso8x8.h
diff -u /dev/null src/sys/dev/wsfont/vt220iso8x8.h:1.1
--- /dev/null	Thu Jul 22 12:48:00 2010
+++ src/sys/dev/wsfont/vt220iso8x8.h	Thu Jul 22 12:48:00 2010
@@ -0,0 +1,2623 @@
+/*	$NetBSD: vt220iso8x8.h,v 1.1 2010/07/22 12:48:00 tsutsui Exp $	*/
+
+/*
+ *  Copyright (c) 1992, 1993, 1994 Hellmuth Michaelis and Joerg Wunsch
+ *  
+ *  All rights reserved.
+ * 
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *  1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *  3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * 	This product includes software developed by
+ *	Hellmuth Michaelis and Joerg Wunsch
+ *  4. The name authors may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ * 
+ *  THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSI

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

2010-07-22 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Thu Jul 22 07:55:22 UTC 2010

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

Log Message:
Cosmetic.


To generate a diff of this commit:
cvs rdiff -u -r1.153.2.46 -r1.153.2.47 src/sys/uvm/uvm_page.c

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

Modified files:

Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.46 src/sys/uvm/uvm_page.c:1.153.2.47
--- src/sys/uvm/uvm_page.c:1.153.2.46	Thu Jul 22 07:49:45 2010
+++ src/sys/uvm/uvm_page.c	Thu Jul 22 07:55:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.46 2010/07/22 07:49:45 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.47 2010/07/22 07:55:22 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.46 2010/07/22 07:49:45 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.47 2010/07/22 07:55:22 uebayasi Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -194,6 +194,16 @@
 
 static void uvm_pageinsert(struct uvm_object *, struct vm_page *);
 static void uvm_pageremove(struct uvm_object *, struct vm_page *);
+static struct vm_physseg *uvm_page_physload_common(
+struct vm_physseg_freelist * const, struct vm_physseg **, int,
+const paddr_t, const paddr_t);
+static void uvm_page_physunload_common(struct vm_physseg_freelist *,
+struct vm_physseg **, struct vm_physseg *);
+static void uvm_page_physseg_init(void);
+static struct vm_physseg * uvm_physseg_insert(struct vm_physseg_freelist *,
+struct vm_physseg **, int, const paddr_t, const paddr_t);
+static void uvm_physseg_remove(struct vm_physseg_freelist *,
+struct vm_physseg **, struct vm_physseg *);
 
 /*
  * per-object tree of pages
@@ -772,22 +782,6 @@
  * => we are limited to VM_PHYSSEG_MAX physical memory segments
  */
 
-static struct vm_physseg *
-uvm_page_physload_common(struct vm_physseg_freelist * const,
-struct vm_physseg **, int,
-const paddr_t, const paddr_t);
-static void
-uvm_page_physunload_common(struct vm_physseg_freelist *,
-struct vm_physseg **, struct vm_physseg *);
-static void
-uvm_page_physseg_init(void);
-static struct vm_physseg *
-uvm_physseg_insert(struct vm_physseg_freelist *, struct vm_physseg **, int,
-const paddr_t, const paddr_t);
-static void
-uvm_physseg_remove(struct vm_physseg_freelist *, struct vm_physseg **,
-struct vm_physseg *);
-
 void *
 uvm_page_physload(paddr_t start, paddr_t end, paddr_t avail_start,
 paddr_t avail_end, int free_list)

CVS commit: [uebayasi-xip] src/sys

2010-07-22 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Thu Jul 22 07:49:46 UTC 2010

Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
src/sys/uvm [uebayasi-xip]: uvm_bio.c uvm_fault.c uvm_page.c uvm_page.h

Log Message:
s/PG_XIP/PQ_FIXED/, meaning that the fault handler sees XIP pages as
"fixed", and doesn't pass them to paging activity.

("XIP" is a vnode specific knowledge.  It was wrong that the fault
handler had to know such a special thing.)


To generate a diff of this commit:
cvs rdiff -u -r1.36.2.17 -r1.36.2.18 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.68.2.9 -r1.68.2.10 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.166.2.18 -r1.166.2.19 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.153.2.45 -r1.153.2.46 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.59.2.26 -r1.59.2.27 src/sys/uvm/uvm_page.h

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

Modified files:

Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.17 src/sys/miscfs/genfs/genfs_io.c:1.36.2.18
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.17	Tue Jul 20 15:43:48 2010
+++ src/sys/miscfs/genfs/genfs_io.c	Thu Jul 22 07:49:46 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfs_io.c,v 1.36.2.17 2010/07/20 15:43:48 uebayasi Exp $	*/
+/*	$NetBSD: genfs_io.c,v 1.36.2.18 2010/07/22 07:49:46 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.17 2010/07/20 15:43:48 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.18 2010/07/22 07:49:46 uebayasi Exp $");
 
 #include "opt_xip.h"
 
@@ -873,7 +873,7 @@
 			KASSERT((pg->flags & PG_BUSY) == 0);
 			KASSERT((pg->flags & PG_RDONLY) != 0);
 			KASSERT((pg->flags & PG_CLEAN) != 0);
-			KASSERT((pg->flags & PG_XIP) != 0);
+			KASSERT((pg->pqflags & PQ_FIXED) != 0);
 			pg->flags |= PG_BUSY;
 			pg->flags &= ~PG_FAKE;
 			pg->uobject = &vp->v_uobj;

Index: src/sys/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.68.2.9 src/sys/uvm/uvm_bio.c:1.68.2.10
--- src/sys/uvm/uvm_bio.c:1.68.2.9	Thu Jul 15 08:33:46 2010
+++ src/sys/uvm/uvm_bio.c	Thu Jul 22 07:49:45 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_bio.c,v 1.68.2.9 2010/07/15 08:33:46 uebayasi Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.68.2.10 2010/07/22 07:49:45 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.68.2.9 2010/07/15 08:33:46 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.68.2.10 2010/07/22 07:49:45 uebayasi Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_ubc.h"
@@ -387,7 +387,7 @@
 		mask = rdonly ? ~VM_PROT_WRITE : VM_PROT_ALL;
 		error = pmap_enter(ufi->orig_map->pmap, va, VM_PAGE_TO_PHYS(pg),
 		prot & mask, PMAP_CANFAIL | (access_type & mask));
-		if (__predict_true((pg->flags & PG_XIP) == 0)) {
+		if (__predict_true((pg->pqflags & PQ_FIXED) == 0)) {
 			mutex_enter(&uvm_pageqlock);
 			uvm_pageactivate(pg);
 			mutex_exit(&uvm_pageqlock);

Index: src/sys/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.166.2.18 src/sys/uvm/uvm_fault.c:1.166.2.19
--- src/sys/uvm/uvm_fault.c:1.166.2.18	Thu Jul 15 08:33:46 2010
+++ src/sys/uvm/uvm_fault.c	Thu Jul 22 07:49:45 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_fault.c,v 1.166.2.18 2010/07/15 08:33:46 uebayasi Exp $	*/
+/*	$NetBSD: uvm_fault.c,v 1.166.2.19 2010/07/22 07:49:45 uebayasi Exp $	*/
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.166.2.18 2010/07/15 08:33:46 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.166.2.19 2010/07/22 07:49:45 uebayasi Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_xip.h"
@@ -1760,7 +1760,7 @@
 	 * for this.  we can just directly enter the pages.
 	 */
 
-	if (__predict_true((pg->flags & PG_XIP) == 0)) {
+	if (__predict_true((pg->pqflags & PQ_FIXED) == 0)) {
 		mutex_enter(&uvm_pageqlock);
 		uvm_pageenqueue(pg);
 		mutex_exit(&uvm_pageqlock);
@@ -2192,7 +2192,7 @@
 		return ERESTART;
 	}
 
-	if (__predict_true((pg->flags & PG_XIP) == 0))
+	if (__predict_true((pg->pqflags & PQ_FIXED) == 0))
 		uvm_fault_lower_done(ufi, flt, uobj, anon, pg);
 
 	pg->flags &= ~(PG_BUSY|PG_FAKE|PG_WANTED);

Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.45 src/sys/uvm/uvm_page.c:1.153.2.46
--- src/sys/uvm/uvm_page.c:1.153.2.45	Thu Jul 15 08:33:46 2010
+++ src/sys/uvm/uvm_page.c	Thu Jul 22 07:49:45 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.45 2010/07/15 08:33:46 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.46 2010/07/22 07:49:45 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.45 2010/07/15 08:33:46 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.46 2010/07/22 07:49:45 uebayasi Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -870,7 +870,

CVS commit: src/sys/dev/acpi

CVS commit: src/sys/compat/ibcs2

CVS commit: src/sys

CVS commit: src/doc

CVS commit: src/sys/arch

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

CVS commit: [netbsd-4] src/doc

CVS commit: [netbsd-4] src/sys/netsmb

CVS commit: [netbsd-4-0] src/doc

CVS commit: [netbsd-4-0] src/sys/netsmb

CVS commit: src/lib/libc/sys

CVS commit: src/share/man/man4

CVS commit: src/lib/libc/sys

CVS commit: src/sys/fs/msdosfs

CVS commit: src/sys/dev/acpi

CVS commit: src

CVS commit: src/sys/dev/wsfont

CVS commit: src/sys/dev/wsfont

CVS commit: src/sys/dev/wsfont

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

CVS commit: [uebayasi-xip] src/sys

21 matches

Site Navigation

Mail list logo

Footer information