subject:"CVS commit\: \[netbsd\-5\] src"

CVS commit: [netbsd-5] src/doc

2009-11-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Nov  8 23:03:58 UTC 2009

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

Log Message:
Tickets 932, 1122, 1124-1126, 1129, and 1131.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.133 -r1.1.2.134 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.133 src/doc/CHANGES-5.1:1.1.2.134
--- src/doc/CHANGES-5.1:1.1.2.133	Sun Nov  1 16:13:41 2009
+++ src/doc/CHANGES-5.1	Sun Nov  8 23:03:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.133 2009/11/01 16:13:41 bouyer Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.134 2009/11/08 23:03:58 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14615,3 +14615,85 @@
 	Add hungarian keyboard layout.
 	[ahoka, ticket #]
 
+sys/kern/uipc_usrreq.c1.127
+
+	In uipc_usrreq(PRU_ACCEPT), grab the unp_streamlock before
+	unp_setpeerlocks().  This fixes a race where, for a short period
+	of time, so-so_lock and so2-so_lock are not sync. This makes
+	solocked2() and solocked() unreliable and cause DIAGNOSTIC kernel
+	panics. This also fixes a possible panic in unp_setaddr() which
+	expects the socket locked.  Should fix kern/38968.
+	[bouyer, ticket #932]
+
+dist/pppd/chat/chat.81.6
+usr.sbin/acpitools/amldb/amldb.8		1.4
+
+	Fix markup and backslashes.
+	[joerg, ticket #1122]
+
+sys/dev/pci/if_age.c1.29, 1.30, 1.34
+sys/dev/pci/if_agereg.h1.3
+sys/dev/pci/if_ale.c1.9
+
+	age(4):
+	- Support flow control.
+	- Add TWSI registers.
+	- Don't access VPD even if hardware advertised the capability.
+	  It seems that some revisions of the controllers hang while
+	  accessing the VPD. Because VPD access routine is now unused,
+	  nuke it.
+	- Let TWSI reload EEPROM if VPD capability is detected. Reloading
+	  the EEPROM will also set the Ethernet address, so age(4) now
+	  reads AGE_PAR0 and AGE_PAR1 register to get the Ethernet address.
+	  This removes removes a lot of hacks and enhance readability a lot.
+	- Double PHY reset timeout as it takes more time to take the PHY out
+	  of power-saving state.
+	- Explicitly check power-saving state by checking undocumented PHY
+	  registers. If link is not up, poke undocumented registers to take
+	  PHY out of power-saving state. This is the same thing done by the
+	  Linux driver.
+	- Don't rely on auto-clearing feature of master reset bit, just wait
+	  1ms and check idle status of MAC.
+
+	age(4) and ale(4):
+	Use m_pullup to handle defragmentation.
+	Reinject mbuf into TX queue when it couldn't be loaded.
+	[cegger, ticket #1124]
+
+include/link_elf.h1.8
+
+	typedef struct link_map as Link_map (for solaris-compat)
+	[pooka, ticket #1125]
+
+usr.sbin/postinstall/postinstall		1.106
+
+	/usr/X11R7/lib/X11/xkb/symbols/pc used to be a directory, but
+	changed to a file on 2009-06-12.  Fixing this requires removing
+	the directory (which we can do) and re-extracting the xbase set
+	(which we can't do), or at least adding that one file (which we
+	may be able to do if X11SRCDIR is available).
+	[apb, ticket #1126]
+
+sys/kern/vfs_subr.c1.386
+sys/ufs/ufs/ufs_ihash.c1.28
+
+	getcleanvnode(): don't vclean() the vnode if it has gained another
+	  reference while we were getting the v_interlock.
+	vget(): attempt prevent it from returning a clean vnode:
+	  if the vnode is being inactivated (by vrelel()), wait for
+	  vrelel() to complete (or return EBUSY if we can't wait), and
+	  return ENOENT if the vnode has been vclean'ed by vrelel()
+	Fixes kern/41147 in a better way, and hopefully fixes other related
+	race conditions.
+	[bouyer, ticket #1129]
+
+usr.bin/gzip/gzip.c1.95-1.97
+usr.bin/gzip/unbzip2.c1.12
+usr.bin/gzip/unpack.c1.1
+
+	- Fix support for multi-section bzip2 files, as created by pbzip2.
+	- Add pack uncompression support.
+	- Avoid an overflow in suffix handling.
+	- Bump version number.
+	[mrg, ticket #1131]
+

CVS commit: [netbsd-5] src/dist/nvi/regex

2009-11-01 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Nov  1 16:10:12 UTC 2009

Modified Files:
src/dist/nvi/regex [netbsd-5]: regexec.c

Log Message:
Pull up following revision(s) (requested by dsl in ticket #1121):
dist/nvi/regex/regexec.c: revision 1.4
Fix regexp on LP64 systems.
By the time 'states1' was expanded, it became 'char *' so the code tried
to put 64 bits into an int!
Fixed PR/41924


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.6.1 -r1.1.1.2.6.2 src/dist/nvi/regex/regexec.c

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

Modified files:

Index: src/dist/nvi/regex/regexec.c
diff -u src/dist/nvi/regex/regexec.c:1.1.1.2.6.1 src/dist/nvi/regex/regexec.c:1.1.1.2.6.2
--- src/dist/nvi/regex/regexec.c:1.1.1.2.6.1	Tue Jan 20 02:41:13 2009
+++ src/dist/nvi/regex/regexec.c	Sun Nov  1 16:10:12 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: regexec.c,v 1.1.1.2.6.1 2009/01/20 02:41:13 snj Exp $ */
+/*	$NetBSD: regexec.c,v 1.1.1.2.6.2 2009/11/01 16:10:12 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -67,7 +67,7 @@
 
 /* macros for manipulating states, small version */
 #define	states	int
-#define	states1	states		/* for later use in regexec() decision */
+#define	states1	int		/* for later use in regexec() decision */
 #define	CLEAR(v)	((v) = 0)
 #define	SET0(v, n)	((v) = ~(1  (n)))
 #define	SET1(v, n)	((v) |= 1  (n))

CVS commit: [netbsd-5] src/doc

2009-11-01 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Nov  1 16:13:41 UTC 2009

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

Log Message:
Tickets  and 1121


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.132 -r1.1.2.133 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.132 src/doc/CHANGES-5.1:1.1.2.133
--- src/doc/CHANGES-5.1:1.1.2.132	Sat Oct 31 13:45:59 2009
+++ src/doc/CHANGES-5.1	Sun Nov  1 16:13:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.132 2009/10/31 13:45:59 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.133 2009/11/01 16:13:41 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14601,3 +14601,17 @@
 	B-channel fifos.
 	[martin, ticket #1119]
 
+dist/nvi/regex/regexec.c			1.4
+
+	Fix regexp on LP64 systems.
+	By the time 'states1' was expanded, it became 'char *' so the
+	code tried to put 64 bits into an int!  Fixed PR/41924
+	[dsl, ticket #1121]
+
+sys/dev/pckbport/wskbdmap_mfii.c		patch
+sys/dev/wscons/wsksymdef.h			patch
+sys/dev/wscons/wskbdutil.c			patch
+
+	Add hungarian keyboard layout.
+	[ahoka, ticket #]
+

CVS commit: [netbsd-5] src/sys/arch/alpha/alpha

2009-10-31 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sat Oct 31 13:25:56 UTC 2009

Modified Files:
src/sys/arch/alpha/alpha [netbsd-5]: machdep.c

Log Message:
Pull up the following revisions(s) (requested by mhitch in ticket #1118):
sys/arch/alpha/alpha/machdep.c: revision 1.321

Ensures the cpu running the shutdown waits for the correct cpus to halt
and thus stop the machine hanging at shutdown.


To generate a diff of this commit:
cvs rdiff -u -r1.307.4.1 -r1.307.4.2 src/sys/arch/alpha/alpha/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/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.307.4.1 src/sys/arch/alpha/alpha/machdep.c:1.307.4.2
--- src/sys/arch/alpha/alpha/machdep.c:1.307.4.1	Mon Feb  2 03:30:32 2009
+++ src/sys/arch/alpha/alpha/machdep.c	Sat Oct 31 13:25:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.307.4.1 2009/02/02 03:30:32 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.307.4.2 2009/10/31 13:25:56 sborrill Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.307.4.1 2009/02/02 03:30:32 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.307.4.2 2009/10/31 13:25:56 sborrill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -965,8 +965,7 @@
 {
 #if defined(MULTIPROCESSOR)
 	u_long cpu_id = cpu_number();
-	u_long wait_mask = (1UL  cpu_id) |
-			   (1UL  hwrpb-rpb_primary_cpu_id);
+	u_long wait_mask;
 	int i;
 #endif
 
@@ -1000,6 +999,9 @@
 	 * Halt all other CPUs.  If we're not the primary, the
 	 * primary will spin, waiting for us to halt.
 	 */
+	cpu_id = cpu_number();		/* may have changed cpu */
+	wait_mask = (1UL  cpu_id) | (1UL  hwrpb-rpb_primary_cpu_id);
+
 	alpha_broadcast_ipi(ALPHA_IPI_HALT);
 
 	/* Ensure any CPUs paused by DDB resume execution so they can halt */

CVS commit: [netbsd-5] src/doc

2009-10-31 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sat Oct 31 13:26:22 UTC 2009

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

Log Message:
Ticket 1118


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.129 -r1.1.2.130 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.129 src/doc/CHANGES-5.1:1.1.2.130
--- src/doc/CHANGES-5.1:1.1.2.129	Sat Oct 31 12:54:08 2009
+++ src/doc/CHANGES-5.1	Sat Oct 31 13:26:21 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.129 2009/10/31 12:54:08 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.130 2009/10/31 13:26:21 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14576,3 +14576,9 @@
 	thread, preventing new domU from be created.
 	[bouyer, ticket #1117]
 
+sys/arch/alpha/alpha/machdep.c			1.321
+
+	Ensures the cpu running the shutdown waits for the correct
+	cpus to halt and thus stop the machine hanging at shutdown.
+	[mhitch, ticket #1118]
+

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

2009-10-31 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sat Oct 31 13:35:03 UTC 2009

Modified Files:
src/sys/arch/alpha/pci [netbsd-5]: tsp_bus_io.c tsp_bus_mem.c tsvar.h

Log Message:
Pull up the following revisions(s) (requested by mhitch in ticket #1120):
sys/arch/alpha/pci/tsp_bus_io.c:revision 1.6
sys/arch/alpha/pci/tsp_bus_mem.c:   revision 1.9
sys/arch/alpha/pci/tsvar.h: revision 1.7

The tsc(4) bus initialization was using a single statically allocated
extent storage for each tsp(4), which caused a LOCKDEBUG kernel to fail
because the extent storage contained a mutex which panics when the second
mutex_init() is attempted.  Put the extent storage into the tsp_config
structure so each tsp(4) gets it own.  Fixes PR port-alpha/38358.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.140.1 src/sys/arch/alpha/pci/tsp_bus_io.c
cvs rdiff -u -r1.8 -r1.8.88.1 src/sys/arch/alpha/pci/tsp_bus_mem.c
cvs rdiff -u -r1.5 -r1.5.88.1 src/sys/arch/alpha/pci/tsvar.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/alpha/pci/tsp_bus_io.c
diff -u src/sys/arch/alpha/pci/tsp_bus_io.c:1.5 src/sys/arch/alpha/pci/tsp_bus_io.c:1.5.140.1
--- src/sys/arch/alpha/pci/tsp_bus_io.c:1.5	Thu Jun 29 08:58:50 2000
+++ src/sys/arch/alpha/pci/tsp_bus_io.c	Sat Oct 31 13:35:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_bus_io.c,v 1.5 2000/06/29 08:58:50 mrg Exp $ */
+/* $NetBSD: tsp_bus_io.c,v 1.5.140.1 2009/10/31 13:35:03 sborrill Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -33,7 +33,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: tsp_bus_io.c,v 1.5 2000/06/29 08:58:50 mrg Exp $);
+__KERNEL_RCSID(1, $NetBSD: tsp_bus_io.c,v 1.5.140.1 2009/10/31 13:35:03 sborrill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -58,6 +58,8 @@
 
 #define	CHIP_EX_MALLOC_SAFE(v)  (((TSPCON)(v))-pc_mallocsafe)
 #define CHIP_IO_EXTENT(v)   (((TSPCON)(v))-pc_io_ex)
+#define	CHIP_IO_EX_STORE(v)	(((TSPCON)(v))-pc_io_exstorage)
+#define	CHIP_IO_EX_STORE_SIZE(v) (sizeof (((TSPCON)(v))-pc_io_exstorage))
 
 #define CHIP_IO_SYS_START(v)(((TSPCON)(v))-pc_iobase | P_PCI_IO)
 

Index: src/sys/arch/alpha/pci/tsp_bus_mem.c
diff -u src/sys/arch/alpha/pci/tsp_bus_mem.c:1.8 src/sys/arch/alpha/pci/tsp_bus_mem.c:1.8.88.1
--- src/sys/arch/alpha/pci/tsp_bus_mem.c:1.8	Sun Dec 11 12:16:17 2005
+++ src/sys/arch/alpha/pci/tsp_bus_mem.c	Sat Oct 31 13:35:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_bus_mem.c,v 1.8 2005/12/11 12:16:17 christos Exp $ */
+/* $NetBSD: tsp_bus_mem.c,v 1.8.88.1 2009/10/31 13:35:03 sborrill Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tsp_bus_mem.c,v 1.8 2005/12/11 12:16:17 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tsp_bus_mem.c,v 1.8.88.1 2009/10/31 13:35:03 sborrill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -55,6 +55,9 @@
 
 #define	CHIP_EX_MALLOC_SAFE(v)  (((struct tsp_config *)(v))-pc_mallocsafe)
 #define CHIP_MEM_EXTENT(v)   (((struct tsp_config *)(v))-pc_mem_ex)
+#define	CHIP_MEM_EX_STORE(v)	(((struct tsp_config *)(v))-pc_mem_exstorage)
+#define	CHIP_MEM_EX_STORE_SIZE(v)	\
+	(sizeof (((struct tsp_config *)(v))-pc_mem_exstorage))
 
 #define CHIP_MEM_SYS_START(v)(((struct tsp_config *)(v))-pc_iobase)
 

Index: src/sys/arch/alpha/pci/tsvar.h
diff -u src/sys/arch/alpha/pci/tsvar.h:1.5 src/sys/arch/alpha/pci/tsvar.h:1.5.88.1
--- src/sys/arch/alpha/pci/tsvar.h:1.5	Sun Dec 11 12:16:17 2005
+++ src/sys/arch/alpha/pci/tsvar.h	Sat Oct 31 13:35:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tsvar.h,v 1.5 2005/12/11 12:16:17 christos Exp $ */
+/* $NetBSD: tsvar.h,v 1.5.88.1 2009/10/31 13:35:03 sborrill Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -35,6 +35,8 @@
 #include dev/pci/pcivar.h
 #include alpha/pci/pci_sgmap_pte64.h
 
+#define	_FSTORE	(EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long))
+
 #define	tsvar() { Generate ctags(1) key. }
 
 struct tsc_softc {
@@ -58,6 +60,8 @@
 	u_int32_t pc_hae_mem;
 	u_int32_t pc_hae_io;
 
+	long	pc_io_exstorage[_FSTORE];
+	long	pc_mem_exstorage[_FSTORE];
 	struct	extent *pc_io_ex, *pc_mem_ex;
 	int	pc_mallocsafe;
 };

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

2009-10-31 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sat Oct 31 13:45:27 UTC 2009

Modified Files:
src/sys/dev/pci [netbsd-5]: ifpci2.c

Log Message:
Pull up the following revisions(s) (requested by martin in ticket #1119):
sys/dev/pci/ifpci2.c:   revision 1.17

Fix endianess issues with ifritz(4) when accessing the B-channel fifos.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.14.1 src/sys/dev/pci/ifpci2.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/ifpci2.c
diff -u src/sys/dev/pci/ifpci2.c:1.13 src/sys/dev/pci/ifpci2.c:1.13.14.1
--- src/sys/dev/pci/ifpci2.c:1.13	Thu Apr 10 19:13:37 2008
+++ src/sys/dev/pci/ifpci2.c	Sat Oct 31 13:45:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpci2.c,v 1.13 2008/04/10 19:13:37 cegger Exp $	*/
+/* $NetBSD: ifpci2.c,v 1.13.14.1 2009/10/31 13:45:27 sborrill Exp $	*/
 /*
  *   Copyright (c) 1999 Gary Jennejohn. All rights reserved.
  *
@@ -36,14 +36,14 @@
  *	Fritz!Card PCI driver
  *	
  *
- *	$Id: ifpci2.c,v 1.13 2008/04/10 19:13:37 cegger Exp $
+ *	$Id: ifpci2.c,v 1.13.14.1 2009/10/31 13:45:27 sborrill Exp $
  *
  *  last edit-date: [Fri Jan  5 11:38:58 2001]
  *
  *---*/
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ifpci2.c,v 1.13 2008/04/10 19:13:37 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: ifpci2.c,v 1.13.14.1 2009/10/31 13:45:27 sborrill Exp $);
 
 
 #include sys/param.h
@@ -419,20 +419,19 @@
 static void
 hscx_read_fifo(int chan, void *buf, size_t len, struct isic_softc *sc)
 {
-	u_int32_t *ip;
-	size_t cnt;
-	int dataoff;
+	int dataoff;	
 
 	dataoff = chan ? HSCX_FIFO2 : HSCX_FIFO1;
-
-	ip = (u_int32_t *)buf;
-	cnt = 0;
-	/* what if len isn't a multiple of sizeof(int) and buf is */
-	/* too small  */
-	while (cnt  len)
-	{
-		*ip++ = bus_space_read_4(sc-sc_maps[0].t, sc-sc_maps[0].h, dataoff);
-		cnt += 4;
+	bus_space_read_multi_stream_4(sc-sc_maps[0].t, sc-sc_maps[0].h,
+	dataoff, buf, len/4);
+	if (__predict_false((len3)0)) {
+		uint32_t tmp;
+
+		buf = ((unsigned char*)buf) + (len  ~3u);
+		len = 3u;
+		tmp = bus_space_read_stream_4(sc-sc_maps[0].t,
+		sc-sc_maps[0].h, dataoff);
+		memcpy(buf, tmp, len);
 	}
 }
 
@@ -464,7 +463,6 @@
 static void
 hscx_write_fifo(int chan, const void *buf, size_t len, struct isic_softc *sc)
 {
-	const u_int32_t *ip;
 	size_t cnt;
 	int dataoff;
 	l1_bchan_state_t *Bchan = sc-sc_chan[chan];
@@ -485,13 +483,17 @@
 	AVMA1PPSETCMDLONG(cnt);
 	hscx_write_reg(chan, cnt, sc);
 
-	ip = (const u_int32_t *)buf;
-	cnt = 0;
-	while (cnt  len)
-	{
-		bus_space_write_4(sc-sc_maps[0].t, sc-sc_maps[0].h, dataoff, *ip);
-		ip++;
-		cnt += 4;
+	bus_space_write_multi_stream_4(sc-sc_maps[0].t, sc-sc_maps[0].h,
+	dataoff, buf, (len+3)/4);
+	if (__predict_false((len3)0)) {
+		uint32_t tmp;
+
+		buf = (const unsigned char*)buf + (len  ~3u);
+		len = 3u;
+		memset(tmp, 0, sizeof(tmp));
+		memcpy(tmp, buf, len);
+		bus_space_write_stream_4(sc-sc_maps[0].t, sc-sc_maps[0].h,
+		dataoff, tmp);
 	}
 }

CVS commit: [netbsd-5] src/doc

2009-10-31 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sat Oct 31 13:45:59 UTC 2009

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

Log Message:
Ticket 1119


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.131 -r1.1.2.132 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.131 src/doc/CHANGES-5.1:1.1.2.132
--- src/doc/CHANGES-5.1:1.1.2.131	Sat Oct 31 13:35:37 2009
+++ src/doc/CHANGES-5.1	Sat Oct 31 13:45:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.131 2009/10/31 13:35:37 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.132 2009/10/31 13:45:59 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14595,3 +14595,9 @@
 	Fixes PR port-alpha/38358.
 	[mhitch, ticket #1120]
 
+sys/dev/pci/ifpci2.c1.17
+
+	Fix endianess issues with ifritz (4) when accessing the
+	B-channel fifos.
+	[martin, ticket #1119]
+

CVS commit: [netbsd-5] src

2009-10-28 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Oct 28 09:03:42 UTC 2009

Modified Files:
src/distrib/sets/lists/man [netbsd-5]: mi
src/share/man/man4 [netbsd-5]: Makefile
src/sys/arch/amd64/conf [netbsd-5]: GENERIC
src/sys/arch/i386/conf [netbsd-5]: ALL GENERIC
src/sys/dev/pci [netbsd-5]: files.pci pcidevs
Added Files:
src/share/man/man4 [netbsd-5]: sdhc.4
src/sys/dev/pci [netbsd-5]: sdhc_pci.c

Log Message:
Pull up the following revisions, requested by sborrill in ticket #1114:
share/man/man4/sdhc.4   1.1-1.2
sys/dev/pci/sdhc_pci.c  1.1-1.3
distrib/sets/lists/man/mi   patch
share/man/man4/Makefile patch
sys/arch/amd64/conf/GENERIC patch
sys/arch/i386/conf/ALL  patch
sys/arch/i386/conf/GENERIC  patch
sys/dev/pci/files.pci   patch
sys/dev/pci/pcidevs patch
sys/dev/pci/pcidevs.h   regen
sys/dev/pci/pcidevs_data.h  regen

Add sdhc(4), a driver for SD controllers following the SD Host
Controller Standard Simplified Specification.


To generate a diff of this commit:
cvs rdiff -u -r1.1109.2.12 -r1.1109.2.13 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.482.2.7 -r1.482.2.8 src/share/man/man4/Makefile
cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/sdhc.4
cvs rdiff -u -r1.231.4.6 -r1.231.4.7 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.183.4.6 -r1.183.4.7 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.915.2.9 -r1.915.2.10 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.308.2.5 -r1.308.2.6 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.962.4.5 -r1.962.4.6 src/sys/dev/pci/pcidevs
cvs rdiff -u -r0 -r1.3.2.2 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/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1109.2.12 src/distrib/sets/lists/man/mi:1.1109.2.13
--- src/distrib/sets/lists/man/mi:1.1109.2.12	Sun Oct 18 16:50:13 2009
+++ src/distrib/sets/lists/man/mi	Wed Oct 28 09:03:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1109.2.12 2009/10/18 16:50:13 bouyer Exp $
+# $NetBSD: mi,v 1.1109.2.13 2009/10/28 09:03:41 bouyer Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -1352,6 +1352,7 @@
 ./usr/share/man/cat4/scsi.0			man-sys-catman		.cat
 ./usr/share/man/cat4/scsibus.0			man-sys-catman		.cat
 ./usr/share/man/cat4/sd.0			man-sys-catman		.cat
+./usr/share/man/cat4/sdhc.0			man-sys-catman		.cat
 ./usr/share/man/cat4/sdmmc.0			man-sys-catman		.cat
 ./usr/share/man/cat4/se.0			man-sys-catman		.cat
 ./usr/share/man/cat4/sea.0			man-sys-catman		.cat
@@ -3829,6 +3830,7 @@
 ./usr/share/man/html4/scsi.html			man-sys-htmlman		html
 ./usr/share/man/html4/scsibus.html		man-sys-htmlman		html
 ./usr/share/man/html4/sd.html			man-sys-htmlman		html
+./usr/share/man/html4/sdhc.html			man-sys-htmlman		html
 ./usr/share/man/html4/sdmmc.html		man-sys-htmlman		html
 ./usr/share/man/html4/se.html			man-sys-htmlman		html
 ./usr/share/man/html4/sea.html			man-sys-htmlman		html
@@ -6218,6 +6220,7 @@
 ./usr/share/man/man4/scsi.4			man-sys-man		.man
 ./usr/share/man/man4/scsibus.4			man-sys-man		.man
 ./usr/share/man/man4/sd.4			man-sys-man		.man
+./usr/share/man/man4/sdhc.4			man-sys-man		.man
 ./usr/share/man/man4/sdmmc.4			man-sys-man		.man
 ./usr/share/man/man4/se.4			man-sys-man		.man
 ./usr/share/man/man4/sea.4			man-sys-man		.man

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.482.2.7 src/share/man/man4/Makefile:1.482.2.8
--- src/share/man/man4/Makefile:1.482.2.7	Thu Oct  8 09:47:08 2009
+++ src/share/man/man4/Makefile	Wed Oct 28 09:03:42 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.482.2.7 2009/10/08 09:47:08 sborrill Exp $
+#	$NetBSD: Makefile,v 1.482.2.8 2009/10/28 09:03:42 bouyer Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \
@@ -46,7 +46,8 @@
 	qe.4 qec.4 qsphy.4 \
 	raid.4 ral.4 ray.4 rcons.4 re.4 rgephy.4 rlphy.4 rnd.4 route.4 \
 	rs5c372rtc.4 rtk.4 rtw.4 rum.4 \
-	satalink.4 sbus.4 scc.4 scsi.4 sd.4 sdmmc.4 se.4 seeprom.4 sem.4 \
+	satalink.4 sbus.4 scc.4 scsi.4 sd.4 sdhc.4 sdmmc.4 se.4 seeprom.4 \
+	sem.4 \
 	ses.4 sf.4 sfb.4 sgsmix.4 shb.4 \
 	shpcic.4 siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \
 	sm.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.231.4.6 src/sys/arch/amd64/conf/GENERIC:1.231.4.7
--- src/sys/arch/amd64/conf/GENERIC:1.231.4.6	Thu Oct  8 09:47:08 2009
+++ src/sys/arch/amd64/conf/GENERIC	Wed Oct 28 09:03:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.231.4.6 2009/10/08 09:47:08 sborrill Exp $
+# $NetBSD: GENERIC,v 1.231.4.7 2009/10/28 09:03:42 bouyer Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options

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

2009-10-28 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Oct 28 09:06:14 UTC 2009

Modified Files:
src/sys/dev/pci [netbsd-5]: pcidevs.h pcidevs_data.h

Log Message:
Regen for ticket 1114


To generate a diff of this commit:
cvs rdiff -u -r1.963.4.5 -r1.963.4.6 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.962.4.5 -r1.962.4.6 src/sys/dev/pci/pcidevs_data.h

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

Modified files:

Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.963.4.5 src/sys/dev/pci/pcidevs.h:1.963.4.6
--- src/sys/dev/pci/pcidevs.h:1.963.4.5	Sat Sep 26 20:06:46 2009
+++ src/sys/dev/pci/pcidevs.h	Wed Oct 28 09:06:09 2009
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.963.4.5 2009/09/26 20:06:46 snj Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.963.4.6 2009/10/28 09:06:09 bouyer Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.962.4.5 2009/09/26 20:05:43 snj Exp
+ *	NetBSD: pcidevs,v 1.962.4.6 2009/10/28 09:03:42 bouyer Exp
  */
 
 /*
@@ -1818,6 +1818,7 @@
 
 /* ENE Technology products */
 #define	PCI_PRODUCT_ENE_MCR510	0x0510		/* MCR510 PCI Memory Card Reader Controller */
+#define	PCI_PRODUCT_ENE_CB712	0x0550		/* CB712/714/810 PCI SD Card Reader Controller */
 #define	PCI_PRODUCT_ENE_CB1211	0x1211		/* CB1211 CardBus Controller */
 #define	PCI_PRODUCT_ENE_CB1225	0x1225		/* CB1225 CardBus Controller */
 #define	PCI_PRODUCT_ENE_CB1410	0x1410		/* CB1410 CardBus Controller */
@@ -3810,6 +3811,7 @@
 #define	PCI_PRODUCT_TI_PCI72111CB	0x8031		/* PCI7x21/7x11 Cardbus Controller */
 #define	PCI_PRODUCT_TI_PCI72111FW	0x8032		/* PCI7x21/7x11 IEEE 1394 Host Controller */
 #define	PCI_PRODUCT_TI_PCI72111FM	0x8033		/* PCI7x21/7x11 Integrated FlashMedia Controller */
+#define	PCI_PRODUCT_TI_PCI72111SD	0x8034		/* PCI7x21/7x11 SD Card Controller */
 #define	PCI_PRODUCT_TI_PCI6515A	0x8036		/* PCI6515A Cardbus Controller */
 #define	PCI_PRODUCT_TI_PCI6515ASM	0x8038		/* PCI6515A Cardbus Controller (Smart Card mode) */
 #define	PCI_PRODUCT_TI_ACX100A	0x8400		/* ACX100A 802.11b */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.962.4.5 src/sys/dev/pci/pcidevs_data.h:1.962.4.6
--- src/sys/dev/pci/pcidevs_data.h:1.962.4.5	Sat Sep 26 20:06:47 2009
+++ src/sys/dev/pci/pcidevs_data.h	Wed Oct 28 09:06:10 2009
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.962.4.5 2009/09/26 20:06:47 snj Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.962.4.6 2009/10/28 09:06:10 bouyer Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.962.4.5 2009/09/26 20:05:43 snj Exp
+ *	NetBSD: pcidevs,v 1.962.4.6 2009/10/28 09:03:42 bouyer Exp
  */
 
 /*
@@ -6360,6 +6360,10 @@
 	MCR510 PCI Memory Card Reader Controller,
 	},
 	{
+	PCI_VENDOR_ENE, PCI_PRODUCT_ENE_CB712,
+	CB712/714/810 PCI SD Card Reader Controller,
+	},
+	{
 	PCI_VENDOR_ENE, PCI_PRODUCT_ENE_CB1211,
 	CB1211 CardBus Controller,
 	},
@@ -13232,6 +13236,10 @@
 	PCI7x21/7x11 Integrated FlashMedia Controller,
 	},
 	{
+	PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI72111SD,
+	PCI7x21/7x11 SD Card Controller,
+	},
+	{
 	PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI6515A,
 	PCI6515A Cardbus Controller,
 	},
@@ -14596,4 +14604,4 @@
 	Video Controller,
 	},
 };
-const int pci_nproducts = 3048;
+const int pci_nproducts = 3050;

CVS commit: [netbsd-5] src/doc

2009-10-28 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Oct 28 09:08:16 UTC 2009

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

Log Message:
Ticket 1114


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.126 -r1.1.2.127 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.126 src/doc/CHANGES-5.1:1.1.2.127
--- src/doc/CHANGES-5.1:1.1.2.126	Tue Oct 27 22:01:46 2009
+++ src/doc/CHANGES-5.1	Wed Oct 28 09:08:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.126 2009/10/27 22:01:46 bouyer Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.127 2009/10/28 09:08:16 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14559,3 +14559,19 @@
 	 mfs or tmpfs /dev prepared after initial mountroot.
 	[tsutsui, ticket #1115]
 
+share/man/man4/sdhc.41.1-1.2
+sys/dev/pci/sdhc_pci.c1.1-1.3
+distrib/sets/lists/man/mi			patch
+share/man/man4/Makefilepatch
+sys/arch/amd64/conf/GENERIC			patch
+sys/arch/i386/conf/ALLpatch
+sys/arch/i386/conf/GENERIC			patch
+sys/dev/pci/files.pcipatch
+sys/dev/pci/pcidevspatch
+sys/dev/pci/pcidevs.hregen
+sys/dev/pci/pcidevs_data.h			regen
+
+	Add sdhc(4), a driver for SD controllers following the SD Host
+	Controller Standard Simplified Specification.
+	[sborrill, ticket #1114]
+

CVS commit: [netbsd-5] src

2009-10-28 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Wed Oct 28 13:06:22 UTC 2009

Modified Files:
src/doc [netbsd-5]: CHANGES-5.1
src/sys/dev/pckbport [netbsd-5]: wskbdmap_mfii.c

Log Message:
Back out ticket #, it breaks the build.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.127 -r1.1.2.128 src/doc/CHANGES-5.1
cvs rdiff -u -r1.15.8.2 -r1.15.8.3 src/sys/dev/pckbport/wskbdmap_mfii.c

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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.127 src/doc/CHANGES-5.1:1.1.2.128
--- src/doc/CHANGES-5.1:1.1.2.127	Wed Oct 28 09:08:16 2009
+++ src/doc/CHANGES-5.1	Wed Oct 28 13:06:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.127 2009/10/28 09:08:16 bouyer Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.128 2009/10/28 13:06:22 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14533,11 +14533,6 @@
 	Fix problems with SIGWINCH. From Paul Ripke in PR 42161.
 	[wiz, ticket #1110]
 
-sys/dev/pckbport/wskbdmap_mfii.c		 patch
-
-	Add hungarian keyboard layout 
-	[ahoka, ticket #]
-
 sys/ufs/ext2fs/ext2fs_extern.h			1.42
 sys/ufs/ext2fs/ext2fs_vfsops.c			1.152
 sys/ufs/ext2fs/ext2fs_vnops.c			1.91

Index: src/sys/dev/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.2 src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.3
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.2	Tue Oct 27 21:39:21 2009
+++ src/sys/dev/pckbport/wskbdmap_mfii.c	Wed Oct 28 13:06:22 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: wskbdmap_mfii.c,v 1.15.8.2 2009/10/27 21:39:21 bouyer Exp $	*/
+/*	$NetBSD: wskbdmap_mfii.c,v 1.15.8.3 2009/10/28 13:06:22 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.2 2009/10/27 21:39:21 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.3 2009/10/28 13:06:22 bouyer Exp $);
 
 #include opt_wskbdmap.h
 #include sys/types.h
@@ -443,44 +443,6 @@
 KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 
-static const keysym_t pckbd_keydesc_hu[] = {
-/*  pos  normal		shifted		altgr		shift-altgr */
-KC(2),   KS_1,		KS_apostrophe,	KS_asciitilde,
-KC(3),   KS_2,		KS_quotedbl,	KS_dead_caron,
-KC(4),   KS_3,		KS_plus,	KS_asciicircum,
-KC(5),   KS_4,		KS_exclam,	KS_dead_breve,
-KC(6),   KS_5,		KS_percent,	KS_dead_abovering,
-KC(7),   KS_6,		KS_slash,	KS_dead_ogonek,
-KC(8),   KS_7,		KS_equal,	KS_grave,
-KC(9),   KS_8,		KS_parenleft,	KS_dead_dotaccent,
-KC(10),  KS_9,		KS_parenright,	KS_dead_acute,
-KC(11),  KS_odiaeresis,	KS_Odiaeresis,	KS_dead_hungarumlaut,
-KC(12),  KS_udiaeresis,	KS_Udiaeresis,	KS_dead_diaeresis,
-KC(13),  KS_oacute,		KS_Oacute,	KS_dead_cedilla,
-KC(16),  KS_q,		KS_Q,		KS_backslash,
-KC(17),  KS_w,		KS_W,		KS_bar,
-KC(21),  KS_z,
-KC(26),  KS_odoubleacute,	KS_Odoubleacute,KS_division,
-KC(27),  KS_uacute,		KS_Uacute,	KS_multiply,
-KC(33),  KS_f,		KS_F,		KS_bracketleft,
-KC(34),  KS_g,		KS_G,		KS_bracketright,
-KC(39),  KS_eacute,		KS_Eacute,	KS_dollar,
-KC(40),  KS_aacute,		KS_Aacute,	KS_ssharp,
-KC(41),  KS_0,		KS_section,
-KC(43),  KS_udoubleacute,	KS_Udoubleacute,KS_currency,
-KC(44),  KS_y,		KS_Y,		KS_greater,
-KC(45),  KS_x,		KS_X,		KS_numbersign,
-KC(46),  KS_c,		KS_C,		KS_ampersand,
-KC(47),  KS_v,		KS_V,		KS_at,
-KC(48),  KS_b,		KS_B,		KS_braceleft,
-KC(49),  KS_n,		KS_N,		KS_braceright,
-KC(51),  KS_comma,		KS_question,	KS_semicolon,
-KC(52),  KS_period,		KS_colon,
-KC(53),  KS_minus,		KS_underscore,	KS_asterisk,
-KC(86),  KS_iacute,		KS_Iacute,	KS_less,
-KC(184), KS_Mode_switch,	KS_Multi_key,
-};
-
 static const keysym_t pckbd_keydesc_us_declk[] = {
 /*  pos  normal		shifted		altgr		shift-altgr */
 KC(1),	KS_grave,	KS_asciitilde, /* replace escape */
@@ -670,7 +632,6 @@
 	KBD_MAP(KB_ES ,			KB_US,	pckbd_keydesc_es),
 	KBD_MAP(KB_PT,			KB_US,	pckbd_keydesc_pt),
 	KBD_MAP(KB_GR,			KB_US,	pckbd_keydesc_gr),
-	KBD_MAP(KB_HU,			KB_US,	pckbd_keydesc_hu),
 #endif /* WSKBD_USONLY */
 
 	/* placeholders */

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

2009-10-27 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Tue Oct 27 20:31:15 UTC 2009

Modified Files:
src/sys/netsmb [netbsd-5]: smb_smb.c

Log Message:
Pull up following revision(s) (requested by tron in ticket #1104):
sys/netsmb/smb_smb.c: revision 1.31
sys/netsmb/smb_smb.c: revision 1.32
Fix detection of SMB capabilities according to the CIFS spec:
1.) SMB_CAP_LARGE_FILES advertises support for 64-bit file offsets.
2.) SMB_CAP_LARGE_READX and SMB_CAP_LARGE_WRITEX advertise support for
large reads and writes (larger than 64KB).
The code previously only used SMB_CAP_LARGE_READX and SMB_CAP_LARGE_WRITEX
which is not correct and doesn't work for the Apple Time Capsule which
only supports SMB_CAP_LARGE_FILES. With these changes SMBFS can copy a
5GB to a Time Capsule and read it back without problems.
Thanks a lot to Allen Briggs for pointing out the broke assumptions
and explaining the CIFS spec to me. This fixes PR kern/42175.
Fix cut  paste error spotted by Nicolas Joly.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.6.1 src/sys/netsmb/smb_smb.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/smb_smb.c
diff -u src/sys/netsmb/smb_smb.c:1.29 src/sys/netsmb/smb_smb.c:1.29.6.1
--- src/sys/netsmb/smb_smb.c:1.29	Tue Jun 24 10:37:19 2008
+++ src/sys/netsmb/smb_smb.c	Tue Oct 27 20:31:15 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_smb.c,v 1.29 2008/06/24 10:37:19 gmcgarry Exp $	*/
+/*	$NetBSD: smb_smb.c,v 1.29.6.1 2009/10/27 20:31:15 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -38,7 +38,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.29 2008/06/24 10:37:19 gmcgarry Exp $);
+__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.29.6.1 2009/10/27 20:31:15 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -594,6 +594,22 @@
 	u_int16_t residhi, residlo, off, doff;
 	u_int32_t resid;
 
+	if (!(SMB_CAPS(SSTOVC(ssp))  SMB_CAP_LARGE_FILES) 
+	uio-uio_offset = (1LL  32)) {
+		/* Cannot read at/beyond 4G */
+		return (EFBIG);
+	}
+
+	if (!(SMB_CAPS(SSTOVC(ssp))  SMB_CAP_LARGE_READX)) {
+		size_t blksz;
+
+		blksz = SSTOVC(ssp)-vc_txmax - SMB_HDRLEN - 64;
+		if (blksz  0x)
+			blksz = 0x;
+
+		*len = min(blksz, *len);
+	}
+
 	error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_READ_ANDX, scred, rqp);
 	if (error)
 		return error;
@@ -674,8 +690,26 @@
 	u_int8_t wc;
 	u_int16_t resid;
 
+	if (!(SMB_CAPS(SSTOVC(ssp))  SMB_CAP_LARGE_FILES) 
+	uio-uio_offset = (1LL  32)) {
+		/* Cannot write at/beyond 4G */
+		return (EFBIG);
+	}
+
+	if (SMB_CAPS(SSTOVC(ssp))  SMB_CAP_LARGE_WRITEX) {
+		*len = min(SSTOVC(ssp)-vc_wxmax, *len);
+	} else {
+		size_t blksz;
+
+		blksz = SSTOVC(ssp)-vc_txmax - SMB_HDRLEN - 64;
+		if (blksz  0x)
+			blksz = 0x;
+
+		*len = min(blksz, *len);
+	}
+
 	error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_WRITE_ANDX, scred, rqp);
-	if (error)
+	if (error != 0)
 		return (error);
 	smb_rq_getrequest(rqp, mbp);
 	smb_rq_wstart(rqp);
@@ -687,7 +721,6 @@
 	mb_put_uint32le(mbp, 0);	/* MBZ (timeout) */
 	mb_put_uint16le(mbp, 0);	/* !write-thru */
 	mb_put_uint16le(mbp, 0);
-	*len = min(SSTOVC(ssp)-vc_wxmax, *len);
 	mb_put_uint16le(mbp, *len  16);
 	mb_put_uint16le(mbp, *len);
 	mb_put_uint16le(mbp, 64);	/* data offset from header start */
@@ -785,7 +818,8 @@
 {
 	size_t tsize, len, resid;
 	int error = 0;
-	int rx = (SMB_CAPS(SSTOVC(ssp))  SMB_CAP_LARGE_READX);
+	bool rx = (SMB_CAPS(SSTOVC(ssp)) 
+		   (SMB_CAP_LARGE_FILES|SMB_CAP_LARGE_READX)) != 0;
 
 	resid = 0;	/* XXX gcc */
 
@@ -866,7 +900,8 @@
 {
 	int error = 0;
 	size_t len, tsize, resid;
-	int wx = (SMB_CAPS(SSTOVC(ssp))  SMB_CAP_LARGE_WRITEX);
+	bool wx = (SMB_CAPS(SSTOVC(ssp)) 
+		   (SMB_CAP_LARGE_FILES|SMB_CAP_LARGE_WRITEX)) != 0;
 
 	resid = 0;	/* XXX gcc */
 
@@ -877,7 +912,7 @@
 		error = smb_smb_writex(ssp, fid, len, resid, uio, scred);
 		else
 		error = smb_smb_write(ssp, fid, len, resid, uio, scred);
-		if (error)
+		if (error != 0)
 			break;
 		if (resid  len) {
 			error = EIO;

CVS commit: [netbsd-5] src

2009-10-27 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Tue Oct 27 20:37:39 UTC 2009

Modified Files:
src/distrib/sets/lists/base [netbsd-5]: md.amd64 md.sparc64 shl.mi
src/lib/libpuffs [netbsd-5]: puffs.c puffs.h shlib_version

Log Message:
Pull up following revision(s) (requested by pooka in ticket #1105):
lib/libpuffs/puffs.h: revision 1.112
lib/libpuffs/puffs.c: revision 1.100
distrib/sets/lists/base/md.amd64: patch
distrib/sets/lists/base/md.sparc64: patch
distrib/sets/lists/base/shl.mi: patch
lib/libpuffs/shlib_version: patch

Make it possible to supply parameters to puffs_init() later (but
before puffs_mount()).


To generate a diff of this commit:
cvs rdiff -u -r1.25.2.4 -r1.25.2.5 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.23.2.4 -r1.23.2.5 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.450.2.3 -r1.450.2.4 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.92.4.3 -r1.92.4.4 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.108.4.3 -r1.108.4.4 src/lib/libpuffs/puffs.h
cvs rdiff -u -r1.1 -r1.1.24.1 src/lib/libpuffs/shlib_version

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

Modified files:

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.25.2.4 src/distrib/sets/lists/base/md.amd64:1.25.2.5
--- src/distrib/sets/lists/base/md.amd64:1.25.2.4	Tue Aug  4 18:32:07 2009
+++ src/distrib/sets/lists/base/md.amd64	Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.25.2.4 2009/08/04 18:32:07 snj Exp $
+# $NetBSD: md.amd64,v 1.25.2.5 2009/10/27 20:37:38 bouyer Exp $
 ./@MODULEDIR@/adosfsbase-kernel-modules
 ./@MODULEDIR@/adosfs/adosfs.kmod		base-kernel-modules
 ./@MODULEDIR@/azaliabase-kernel-modules
@@ -219,7 +219,7 @@
 ./usr/lib/i386/libpthread_dbg.so.1		base-compat-shlib	compat,pic
 ./usr/lib/i386/libpthread_dbg.so.1.0		base-compat-shlib	compat,pic
 ./usr/lib/i386/libpuffs.so.0			base-compat-shlib	compat,pic
-./usr/lib/i386/libpuffs.so.0.0			base-compat-shlib	compat,pic
+./usr/lib/i386/libpuffs.so.0.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libradius.so.2			base-compat-shlib	compat,pic
 ./usr/lib/i386/libradius.so.2.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libresolv.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.23.2.4 src/distrib/sets/lists/base/md.sparc64:1.23.2.5
--- src/distrib/sets/lists/base/md.sparc64:1.23.2.4	Tue Aug  4 18:32:08 2009
+++ src/distrib/sets/lists/base/md.sparc64	Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.23.2.4 2009/08/04 18:32:08 snj Exp $
+# $NetBSD: md.sparc64,v 1.23.2.5 2009/10/27 20:37:38 bouyer Exp $
 ./sbin/edlabel	base-sysutil-root
 ./usr/bin/fdformatbase-util-bin
 ./usr/lib/sparc	base-compat-lib		compat
@@ -154,7 +154,7 @@
 ./usr/lib/sparc/libpthread_dbg.so.1		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libpthread_dbg.so.1.0		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libpuffs.so.0			base-compat-shlib	compat,pic
-./usr/lib/sparc/libpuffs.so.0.0			base-compat-shlib	compat,pic
+./usr/lib/sparc/libpuffs.so.0.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libradius.so.2			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libradius.so.2.0		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libresolv.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.450.2.3 src/distrib/sets/lists/base/shl.mi:1.450.2.4
--- src/distrib/sets/lists/base/shl.mi:1.450.2.3	Tue Aug  4 18:32:08 2009
+++ src/distrib/sets/lists/base/shl.mi	Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.450.2.3 2009/08/04 18:32:08 snj Exp $
+# $NetBSD: shl.mi,v 1.450.2.4 2009/10/27 20:37:38 bouyer Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -105,7 +105,7 @@
 ./usr/lib/libprop.so.0.7			base-sys-shlib
 ./usr/lib/libpthread.so.0.10			base-sys-shlib
 ./usr/lib/libpthread_dbg.so.1.0			base-sys-shlib
-./usr/lib/libpuffs.so.0.0			base-sys-shlib
+./usr/lib/libpuffs.so.0.1			base-sys-shlib
 ./usr/lib/libradius.so.2.0			base-net-shlib
 ./usr/lib/librefuse.so.0.0			base-sys-shlib	
 ./usr/lib/libresolv.so.1.1			base-net-shlib

Index: src/lib/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.92.4.3 src/lib/libpuffs/puffs.c:1.92.4.4
--- src/lib/libpuffs/puffs.c:1.92.4.3	Sun Oct 18 12:46:07 2009
+++ src/lib/libpuffs/puffs.c	Tue Oct 27 20:37:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $	*/
+/*	$NetBSD: puffs.c,v 1.92.4.4 2009/10/27 20:37:38 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #if !defined(lint)
-__RCSID($NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $);
+__RCSID($NetBSD: puffs.c,v

CVS commit: [netbsd-5] src/sys/fs/smbfs

2009-10-27 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Tue Oct 27 20:46:53 UTC 2009

Modified Files:
src/sys/fs/smbfs [netbsd-5]: smbfs_smb.c smbfs_subr.h

Log Message:
Pull up following revision(s) (requested by tron in ticket #1109):
sys/fs/smbfs/smbfs_smb.c: revision 1.41
sys/fs/smbfs/smbfs_subr.h: revision 1.20
Add support for 64 bit file offsets to smbfs_smb_setfsize(), largely
based on code taken from FreeBSD.
This stops truncation of files larger than 4GB by VOP_SETATTR() which e.g.
happened when copying large files rump_smbfs. Kudos to Antti Kantee
for diagnosing the problem in smbfs_smb_setfsize().


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.6.1 src/sys/fs/smbfs/smbfs_smb.c
cvs rdiff -u -r1.19 -r1.19.6.1 src/sys/fs/smbfs/smbfs_subr.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/fs/smbfs/smbfs_smb.c
diff -u src/sys/fs/smbfs/smbfs_smb.c:1.37 src/sys/fs/smbfs/smbfs_smb.c:1.37.6.1
--- src/sys/fs/smbfs/smbfs_smb.c:1.37	Tue Jun 24 10:23:48 2008
+++ src/sys/fs/smbfs/smbfs_smb.c	Tue Oct 27 20:46:52 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: smbfs_smb.c,v 1.37 2008/06/24 10:23:48 gmcgarry Exp $	*/
+/*	$NetBSD: smbfs_smb.c,v 1.37.6.1 2009/10/27 20:46:52 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.37 2008/06/24 10:23:48 gmcgarry Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.37.6.1 2009/10/27 20:46:52 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -265,14 +265,50 @@
 	return 0;
 }
 
+static int
+smbfs_smb_seteof(struct smbnode *np, int64_t newsize, struct smb_cred *scred)
+{
+	struct smb_t2rq *t2p;
+	struct smb_share *ssp = np-n_mount-sm_share;
+	struct mbchain *mbp;
+	int error;
+
+	error = smb_t2_alloc(SSTOCP(ssp), SMB_TRANS2_SET_FILE_INFORMATION,
+	scred, t2p);
+	if (error)
+		return error;
+	mbp = t2p-t2_tparam;
+	mb_init(mbp);
+	mb_put_mem(mbp, (void *)np-n_fid, 2, MB_MSYSTEM);
+	mb_put_uint16le(mbp, SMB_SET_FILE_END_OF_FILE_INFO);
+	mb_put_uint32le(mbp, 0);
+	mbp = t2p-t2_tdata;
+	mb_init(mbp);
+	mb_put_int64le(mbp, newsize);
+	mb_put_uint32le(mbp, 0);			/* padding */
+	mb_put_uint16le(mbp, 0);
+	t2p-t2_maxpcount = 2;
+	t2p-t2_maxdcount = 0;
+	error = smb_t2_request(t2p);
+	smb_t2_done(t2p);
+	return error;
+}
+
 int
-smbfs_smb_setfsize(struct smbnode *np, int newsize, struct smb_cred *scred)
+smbfs_smb_setfsize(struct smbnode *np, u_quad_t newsize,
+		   struct smb_cred *scred)
 {
 	struct smb_share *ssp = np-n_mount-sm_share;
 	struct smb_rq *rqp;
 	struct mbchain *mbp;
 	int error;
 
+	if (newsize = (1LL  32)) {
+		if (!(SMB_CAPS(SSTOVC(ssp))  SMB_CAP_LARGE_FILES))
+			return EFBIG;
+		return smbfs_smb_seteof(np, (int64_t)newsize, scred);
+	}
+
 	error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_WRITE, scred, rqp);
 	if (error)
 		return error;

Index: src/sys/fs/smbfs/smbfs_subr.h
diff -u src/sys/fs/smbfs/smbfs_subr.h:1.19 src/sys/fs/smbfs/smbfs_subr.h:1.19.6.1
--- src/sys/fs/smbfs/smbfs_subr.h:1.19	Sat Jun 28 01:34:05 2008
+++ src/sys/fs/smbfs/smbfs_subr.h	Tue Oct 27 20:46:52 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: smbfs_subr.h,v 1.19 2008/06/28 01:34:05 rumble Exp $	*/
+/*	$NetBSD: smbfs_subr.h,v 1.19.6.1 2009/10/27 20:46:52 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -135,7 +135,8 @@
 	off_t start, off_t end,	struct smb_cred *scred);
 int  smbfs_smb_statvfs(struct smb_share *ssp, struct statvfs *sbp,
 	struct smb_cred *scred);
-int  smbfs_smb_setfsize(struct smbnode *np, int newsize, struct smb_cred *scred);
+int  smbfs_smb_setfsize(struct smbnode *np, u_quad_t newsize,
+			struct smb_cred *scred);
 
 int  smbfs_smb_setpattr(struct smbnode *np, u_int16_t attr,
 	struct timespec *mtime, struct smb_cred *scred);

CVS commit: [netbsd-5] src/doc

2009-10-27 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Tue Oct 27 20:47:35 UTC 2009

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

Log Message:
Tickets 1104, 1105, 1108, 1109.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.124 src/doc/CHANGES-5.1:1.1.2.125
--- src/doc/CHANGES-5.1:1.1.2.124	Tue Oct 20 02:01:40 2009
+++ src/doc/CHANGES-5.1	Tue Oct 27 20:47:34 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.124 2009/10/20 02:01:40 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.125 2009/10/27 20:47:34 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14483,3 +14483,47 @@
 	Fix header to include.
 	[joerg, ticket #1106]
 
+sys/netsmb/smb_smb.c1.31, 1.32
+
+	Fix detection of SMB capabilities according to the CIFS spec:
+	1.) SMB_CAP_LARGE_FILES advertises support for 64-bit file offsets.
+	2.) SMB_CAP_LARGE_READX and SMB_CAP_LARGE_WRITEX advertise support for
+	large reads and writes (larger than 64KB).
+	The code previously only used SMB_CAP_LARGE_READX and
+	SMB_CAP_LARGE_WRITEX which is not correct and doesn't work for
+	the Apple Time Capsule which only supports SMB_CAP_LARGE_FILES.
+	This fixes PR kern/42175.
+	[tron, ticket #1104]
+
+lib/libpuffs/puffs.c1.100
+lib/libpuffs/puffs.h1.112
+lib/libpuffs/shlib_version			patch
+distrib/sets/lists/base/md.amd64		patch
+distrib/sets/lists/base/md.sparc64		patch
+distrib/sets/lists/base/shl.mi			patch
+
+	Make it possible to supply parameters to puffs_init() later (but
+	before puffs_mount()).
+	[pooka, ticket #1105]
+
+xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c 1.4
+xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h 1.2
+external/mit/xorg/server/drivers/xf86-video-chips/Makefile 1.5
+
+	make this work on shark again by enabling the VLB probe routines
+	when HAVE_ISA is defined. For now this disables the PCI probe
+	routine but the only arch where we actually need this is shark
+	where we couldn't add a PCI CT65550 even if we wanted to.
+	set -DHAVE_ISA on shark, with this accelerated Xorg works again on
+	rev. 4 sharks.
+	[macallan, ticket #1108]
+
+sys/fs/smbfs/smbfs_smb.c			1.41
+sys/fs/smbfs/smbfs_subr.h			1.20
+
+	Add support for 64 bit file offsets to smbfs_smb_setfsize(), largely
+	based on code taken from FreeBSD.
+	This stops truncation of files larger than 4GB by VOP_SETATTR() which
+	e.g.  happened when copying large files rump_smbfs. 
+	[tron, ticket #1109]
+

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

2009-10-27 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Tue Oct 27 21:39:21 UTC 2009

Modified Files:
src/sys/dev/pckbport [netbsd-5]: wskbdmap_mfii.c

Log Message:
Apply patch, requested by ahoka in ticket #:
sys/dev/pckbport/wskbdmap_mfii.c: patch
Add hungarian keyboard layout


To generate a diff of this commit:
cvs rdiff -u -r1.15.8.1 -r1.15.8.2 src/sys/dev/pckbport/wskbdmap_mfii.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/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.1 src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.2
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.1	Mon Feb 16 03:22:03 2009
+++ src/sys/dev/pckbport/wskbdmap_mfii.c	Tue Oct 27 21:39:21 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: wskbdmap_mfii.c,v 1.15.8.1 2009/02/16 03:22:03 snj Exp $	*/
+/*	$NetBSD: wskbdmap_mfii.c,v 1.15.8.2 2009/10/27 21:39:21 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.1 2009/02/16 03:22:03 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.2 2009/10/27 21:39:21 bouyer Exp $);
 
 #include opt_wskbdmap.h
 #include sys/types.h
@@ -443,6 +443,44 @@
 KC(184), KS_Mode_switch,	KS_Multi_key,
 };
 
+static const keysym_t pckbd_keydesc_hu[] = {
+/*  pos  normal		shifted		altgr		shift-altgr */
+KC(2),   KS_1,		KS_apostrophe,	KS_asciitilde,
+KC(3),   KS_2,		KS_quotedbl,	KS_dead_caron,
+KC(4),   KS_3,		KS_plus,	KS_asciicircum,
+KC(5),   KS_4,		KS_exclam,	KS_dead_breve,
+KC(6),   KS_5,		KS_percent,	KS_dead_abovering,
+KC(7),   KS_6,		KS_slash,	KS_dead_ogonek,
+KC(8),   KS_7,		KS_equal,	KS_grave,
+KC(9),   KS_8,		KS_parenleft,	KS_dead_dotaccent,
+KC(10),  KS_9,		KS_parenright,	KS_dead_acute,
+KC(11),  KS_odiaeresis,	KS_Odiaeresis,	KS_dead_hungarumlaut,
+KC(12),  KS_udiaeresis,	KS_Udiaeresis,	KS_dead_diaeresis,
+KC(13),  KS_oacute,		KS_Oacute,	KS_dead_cedilla,
+KC(16),  KS_q,		KS_Q,		KS_backslash,
+KC(17),  KS_w,		KS_W,		KS_bar,
+KC(21),  KS_z,
+KC(26),  KS_odoubleacute,	KS_Odoubleacute,KS_division,
+KC(27),  KS_uacute,		KS_Uacute,	KS_multiply,
+KC(33),  KS_f,		KS_F,		KS_bracketleft,
+KC(34),  KS_g,		KS_G,		KS_bracketright,
+KC(39),  KS_eacute,		KS_Eacute,	KS_dollar,
+KC(40),  KS_aacute,		KS_Aacute,	KS_ssharp,
+KC(41),  KS_0,		KS_section,
+KC(43),  KS_udoubleacute,	KS_Udoubleacute,KS_currency,
+KC(44),  KS_y,		KS_Y,		KS_greater,
+KC(45),  KS_x,		KS_X,		KS_numbersign,
+KC(46),  KS_c,		KS_C,		KS_ampersand,
+KC(47),  KS_v,		KS_V,		KS_at,
+KC(48),  KS_b,		KS_B,		KS_braceleft,
+KC(49),  KS_n,		KS_N,		KS_braceright,
+KC(51),  KS_comma,		KS_question,	KS_semicolon,
+KC(52),  KS_period,		KS_colon,
+KC(53),  KS_minus,		KS_underscore,	KS_asterisk,
+KC(86),  KS_iacute,		KS_Iacute,	KS_less,
+KC(184), KS_Mode_switch,	KS_Multi_key,
+};
+
 static const keysym_t pckbd_keydesc_us_declk[] = {
 /*  pos  normal		shifted		altgr		shift-altgr */
 KC(1),	KS_grave,	KS_asciitilde, /* replace escape */
@@ -632,6 +670,7 @@
 	KBD_MAP(KB_ES ,			KB_US,	pckbd_keydesc_es),
 	KBD_MAP(KB_PT,			KB_US,	pckbd_keydesc_pt),
 	KBD_MAP(KB_GR,			KB_US,	pckbd_keydesc_gr),
+	KBD_MAP(KB_HU,			KB_US,	pckbd_keydesc_hu),
 #endif /* WSKBD_USONLY */
 
 	/* placeholders */

CVS commit: [netbsd-5] src/sys/ufs/ext2fs

2009-10-27 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Tue Oct 27 21:41:07 UTC 2009

Modified Files:
src/sys/ufs/ext2fs [netbsd-5]: ext2fs_extern.h ext2fs_vfsops.c
ext2fs_vnops.c

Log Message:
Pull up following revision(s) (requested by pooka in ticket #1112):
sys/ufs/ext2fs/ext2fs_vnops.c: revision 1.91
sys/ufs/ext2fs/ext2fs_vfsops.c: revision 1.152
sys/ufs/ext2fs/ext2fs_extern.h: revision 1.42
update i_uid and i_gid after chown


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.6.1 src/sys/ufs/ext2fs/ext2fs_extern.h
cvs rdiff -u -r1.137.6.4 -r1.137.6.5 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.82.10.1 -r1.82.10.2 src/sys/ufs/ext2fs/ext2fs_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/ufs/ext2fs/ext2fs_extern.h
diff -u src/sys/ufs/ext2fs/ext2fs_extern.h:1.39 src/sys/ufs/ext2fs/ext2fs_extern.h:1.39.6.1
--- src/sys/ufs/ext2fs/ext2fs_extern.h:1.39	Sat Jun 28 01:34:05 2008
+++ src/sys/ufs/ext2fs/ext2fs_extern.h	Tue Oct 27 21:41:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_extern.h,v 1.39 2008/06/28 01:34:05 rumble Exp $	*/
+/*	$NetBSD: ext2fs_extern.h,v 1.39.6.1 2009/10/27 21:41:07 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -143,6 +143,7 @@
 int ext2fs_flushfiles(struct mount *, int);
 int ext2fs_sbupdate(struct ufsmount *, int);
 int ext2fs_cgupdate(struct ufsmount *, int);
+void ext2fs_set_inode_guid(struct inode *);
 
 /* ext2fs_readwrite.c */
 int ext2fs_read(void *);

Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.4 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.5
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.4	Fri Oct 16 05:51:03 2009
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c	Tue Oct 27 21:41:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vfsops.c,v 1.137.6.4 2009/10/16 05:51:03 snj Exp $	*/
+/*	$NetBSD: ext2fs_vfsops.c,v 1.137.6.5 2009/10/27 21:41:07 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -65,7 +65,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.137.6.4 2009/10/16 05:51:03 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.137.6.5 2009/10/27 21:41:07 bouyer Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_compat_netbsd.h
@@ -113,7 +113,6 @@
 
 int ext2fs_sbupdate(struct ufsmount *, int);
 static int ext2fs_checksb(struct ext2fs *, int);
-static void ext2fs_set_inode_guid(struct inode *);
 
 static struct sysctllog *ext2fs_sysctl_log;
 
@@ -170,7 +169,7 @@
 };
 
 /* Fill in the inode uid/gid from ext2 halves.  */
-static void
+void
 ext2fs_set_inode_guid(struct inode *ip)
 {
 

Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.82.10.1 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.82.10.2
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.82.10.1	Sat Nov 29 23:10:19 2008
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c	Tue Oct 27 21:41:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vnops.c,v 1.82.10.1 2008/11/29 23:10:19 snj Exp $	*/
+/*	$NetBSD: ext2fs_vnops.c,v 1.82.10.2 2009/10/27 21:41:07 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -70,7 +70,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vnops.c,v 1.82.10.1 2008/11/29 23:10:19 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vnops.c,v 1.82.10.2 2009/10/27 21:41:07 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -501,8 +501,10 @@
 		ip-i_e2fs_gid_high = 0;
 		ip-i_e2fs_uid_high = 0;
 	}
-	if (ouid != uid || ogid != gid)
+	if (ouid != uid || ogid != gid) {
+		ext2fs_set_inode_guid(ip);
 		ip-i_flag |= IN_CHANGE;
+	}
 	if (ouid != uid  kauth_authorize_generic(cred,
 	KAUTH_GENERIC_ISSUSER, NULL) != 0)
 		ip-i_e2fs_mode = ~ISUID;

CVS commit: [netbsd-5] src/sys/fs/cd9660

2009-10-27 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Tue Oct 27 21:58:34 UTC 2009

Modified Files:
src/sys/fs/cd9660 [netbsd-5]: cd9660_vfsops.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1115):
sys/fs/cd9660/cd9660_vfsops.c: revision 1.68
Apply a similar fix for mount function from ffs_vfsops.c rev 1.186:
 Change cd9660_mount, in MNT_UPDATE case, to check dev_t's for equality
 instead of just vnode pointers.  Fixes erroneous Invalid argument
 errors from mount(8) with -u against cd9660 root in the presence of
 mfs or tmpfs /dev prepared after initial mountroot.
Tested on QEMU running cobalt Restore CD.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.6.1 src/sys/fs/cd9660/cd9660_vfsops.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/cd9660/cd9660_vfsops.c
diff -u src/sys/fs/cd9660/cd9660_vfsops.c:1.63 src/sys/fs/cd9660/cd9660_vfsops.c:1.63.6.1
--- src/sys/fs/cd9660/cd9660_vfsops.c:1.63	Sat Jun 28 01:34:05 2008
+++ src/sys/fs/cd9660/cd9660_vfsops.c	Tue Oct 27 21:58:34 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_vfsops.c,v 1.63 2008/06/28 01:34:05 rumble Exp $	*/
+/*	$NetBSD: cd9660_vfsops.c,v 1.63.6.1 2009/10/27 21:58:34 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.63 2008/06/28 01:34:05 rumble Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.63.6.1 2009/10/27 21:58:34 bouyer Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_compat_netbsd.h
@@ -286,7 +286,8 @@
 		}
 	} else {
 		vrele(devvp);
-		if (devvp != imp-im_devvp)
+		if (devvp != imp-im_devvp 
+		devvp-v_rdev != imp-im_devvp-v_rdev)
 			return (EINVAL);	/* needs translation */
 	}
 	return set_statvfs_info(path, UIO_USERSPACE, args-fspec, UIO_USERSPACE,

CVS commit: [netbsd-5] src/doc

2009-10-19 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Mon Oct 19 07:24:44 UTC 2009

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

Log Message:
Pull up the following revisions(s) (requested by nakayama in ticket #1103):
sys/arch/sparc64/include/userret.h: revision 1.9
sys/arch/sparc64/sparc64/trap.c:revision 1.158

Merge want_ast check in userret() into trap handler, and repeat preempt()
call while want_resched is true.  While there remove unnecessary #if 1. This
should fix a performance degradation of disk I/O on heavy load.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.122 -r1.1.2.123 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.122 src/doc/CHANGES-5.1:1.1.2.123
--- src/doc/CHANGES-5.1:1.1.2.122	Sun Oct 18 19:04:41 2009
+++ src/doc/CHANGES-5.1	Mon Oct 19 07:24:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.122 2009/10/18 19:04:41 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.123 2009/10/19 07:24:44 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14464,3 +14464,12 @@
 	Add hdaudio directory to the base set list.
 	[sborrill, ticket #1102]
 
+sys/arch/sparc64/include/userret.h		1.9
+sys/arch/sparc64/sparc64/trap.c			1.158
+
+	Merge want_ast check in userret() into trap handler, and
+	repeat preempt() call while want_resched is true.  While
+	there remove unnecessary #if 1. This should fix a performance
+	degradation of disk I/O on heavy load.
+	[nakayama, ticket #1103]
+

CVS commit: [netbsd-5] src/sys/arch/sparc64

2009-10-19 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Mon Oct 19 07:25:45 UTC 2009

Modified Files:
src/sys/arch/sparc64/include [netbsd-5]: userret.h
src/sys/arch/sparc64/sparc64 [netbsd-5]: trap.c

Log Message:
Pull up the following revisions(s) (requested by nakayama in ticket #1103):
sys/arch/sparc64/include/userret.h: revision 1.9
sys/arch/sparc64/sparc64/trap.c:revision 1.158

Merge want_ast check in userret() into trap handler, and repeat preempt()
call while want_resched is true.  While there remove unnecessary #if 1. This
should fix a performance degradation of disk I/O on heavy load.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.6.1 src/sys/arch/sparc64/include/userret.h
cvs rdiff -u -r1.155 -r1.155.4.1 src/sys/arch/sparc64/sparc64/trap.c

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

Modified files:

Index: src/sys/arch/sparc64/include/userret.h
diff -u src/sys/arch/sparc64/include/userret.h:1.8 src/sys/arch/sparc64/include/userret.h:1.8.6.1
--- src/sys/arch/sparc64/include/userret.h:1.8	Mon Jun 30 14:12:20 2008
+++ src/sys/arch/sparc64/include/userret.h	Mon Oct 19 07:25:44 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: userret.h,v 1.8 2008/06/30 14:12:20 nakayama Exp $ */
+/*	$NetBSD: userret.h,v 1.8.6.1 2009/10/19 07:25:44 sborrill Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -63,14 +63,6 @@
 
 	mi_userret(l);
 
-	if (want_ast) {
-		want_ast = 0;
-		if (l-l_pflag  LP_OWEUPC) {
-			l-l_pflag = ~LP_OWEUPC;
-			ADDUPROF(l);
-		}
-	}
-
 	/*
 	 * If profiling, charge recent system time to the trapped pc.
 	 */

Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.155 src/sys/arch/sparc64/sparc64/trap.c:1.155.4.1
--- src/sys/arch/sparc64/sparc64/trap.c:1.155	Wed Oct 15 06:51:19 2008
+++ src/sys/arch/sparc64/sparc64/trap.c	Mon Oct 19 07:25:44 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.155 2008/10/15 06:51:19 wrstuden Exp $ */
+/*	$NetBSD: trap.c,v 1.155.4.1 2009/10/19 07:25:44 sborrill Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.155 2008/10/15 06:51:19 wrstuden Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.155.4.1 2009/10/19 07:25:44 sborrill Exp $);
 
 #include opt_ddb.h
 #include opt_multiprocessor.h
@@ -618,12 +618,14 @@
 #endif
 
 	case T_AST:
-#if 1
-		if (want_resched)
+		if (l-l_pflag  LP_OWEUPC) {
+			l-l_pflag = ~LP_OWEUPC;
+			ADDUPROF(l);
+		}
+		while (want_resched)
 			preempt();
 		want_ast = 0;
-#endif
-		break;	/* the work is all in userret() */
+		break;
 
 	case T_ILLINST:
 	case T_INST_EXCEPT:

CVS commit: [netbsd-5] src/share/mk

2009-10-19 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Oct 20 01:28:59 UTC 2009

Modified Files:
src/share/mk [netbsd-5]: bsd.own.mk

Log Message:
Pull up following revision(s) (requested by rmind in ticket #1107):
share/mk/bsd.own.mk: revision 1.571
add sunleo


To generate a diff of this commit:
cvs rdiff -u -r1.542.2.10 -r1.542.2.11 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.542.2.10 src/share/mk/bsd.own.mk:1.542.2.11
--- src/share/mk/bsd.own.mk:1.542.2.10	Thu Sep 17 04:24:42 2009
+++ src/share/mk/bsd.own.mk	Tue Oct 20 01:28:59 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.542.2.10 2009/09/17 04:24:42 snj Exp $
+#	$NetBSD: bsd.own.mk,v 1.542.2.11 2009/10/20 01:28:59 snj Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -872,8 +872,8 @@
 .for _v in \
 	ag10e apm ark ast ati chips cirrus crime cyrix glint i128 i740 imstt \
 	intel mach64 mga neomagic newport nsc nv nvxbox pnozz r128 radeonhd \
-	rendition s3 s3virge savage siliconmotion sis sunffb suncg6 suntcx \
-	tdfx tga trident tseng vesa vga via vmware wsfb
+	rendition s3 s3virge savage siliconmotion sis sunffb suncg6 sunleo \
+	suntcx tdfx tga trident tseng vesa vga via vmware wsfb
 	
 X11SRCDIR.xf86-video-${_v}?=	${X11SRCDIRMIT}/xf86-video-${_v}/dist
 .endfor

CVS commit: [netbsd-5] src/lib/libc/stdlib

2009-10-19 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Oct 20 01:59:46 UTC 2009

Modified Files:
src/lib/libc/stdlib [netbsd-5]: getsubopt.3

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1106):
lib/libc/stdlib/getsubopt.3: revision 1.12
Fix header to include. From Kristaps Dzonsons.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.38.1 src/lib/libc/stdlib/getsubopt.3

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

Modified files:

Index: src/lib/libc/stdlib/getsubopt.3
diff -u src/lib/libc/stdlib/getsubopt.3:1.11 src/lib/libc/stdlib/getsubopt.3:1.11.38.1
--- src/lib/libc/stdlib/getsubopt.3:1.11	Thu Aug  7 16:43:40 2003
+++ src/lib/libc/stdlib/getsubopt.3	Tue Oct 20 01:59:46 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: getsubopt.3,v 1.11 2003/08/07 16:43:40 agc Exp $
+.\	$NetBSD: getsubopt.3,v 1.11.38.1 2009/10/20 01:59:46 snj Exp $
 .\
 .\ Copyright (c) 1990, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\ @(#)getsubopt.3	8.1 (Berkeley) 6/9/93
 .\
-.Dd June 9, 1993
+.Dd October 19, 2009
 .Dt GETSUBOPT 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In stdlib.h
+.In unistd.h
 .Vt extern char *suboptarg
 .Ft int
 .Fn getsubopt char **optionp char * const *tokens char **valuep

CVS commit: [netbsd-5] src/doc

2009-10-19 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Oct 20 02:01:40 UTC 2009

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

Log Message:
Tickets 1106 and 1107.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.123 src/doc/CHANGES-5.1:1.1.2.124
--- src/doc/CHANGES-5.1:1.1.2.123	Mon Oct 19 07:24:44 2009
+++ src/doc/CHANGES-5.1	Tue Oct 20 02:01:40 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.123 2009/10/19 07:24:44 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.124 2009/10/20 02:01:40 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14473,3 +14473,13 @@
 	degradation of disk I/O on heavy load.
 	[nakayama, ticket #1103]
 
+share/mk/bsd.own.mk 1.571
+
+	Add sunleo.  Should have been part of ticket 1052.
+	[rmind, ticket #1107]
+
+lib/libc/stdlib/getsubopt.3			1.12
+
+	Fix header to include.
+	[joerg, ticket #1106]
+

CVS commit: [netbsd-5] src/dist/nvi

2009-10-18 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sun Oct 18 09:58:03 UTC 2009

Modified Files:
src/dist/nvi/common [netbsd-5]: multibyte.h options.c
src/dist/nvi/ex [netbsd-5]: ex_shift.c ex_txt.c version.h
src/dist/nvi/vi [netbsd-5]: v_ex.c v_increment.c v_txt.c

Log Message:
Pull up the following revisions(s) (requested by aymeric in ticket #1068):
dist/nvi/common/multibyte.h:revision 1.4
dist/nvi/vi/v_increment.c:  revision 1.4
dist/nvi/vi/v_ex.c: revision 1.4
dist/nvi/common/options.c:  revision 1.6
dist/nvi/ex/ex_shift.c: revision 1.3
dist/nvi/ex/ex_txt.c:   revision 1.4
dist/nvi/ex/version.h:  revision 1.4 via patch
dist/nvi/vi/v_txt.c:revision 1.6

Update to nvi-1.81.6nb5:
- Make :ESC, #+ and #- work again.
- Rename expandtabs to expandtab to match documentation.
- Implement the et abbreviation for expandtab.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.6.2 -r1.1.1.2.6.3 src/dist/nvi/common/multibyte.h
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/dist/nvi/common/options.c
cvs rdiff -u -r1.1.1.2.6.1 -r1.1.1.2.6.2 src/dist/nvi/ex/ex_shift.c
cvs rdiff -u -r1.1.1.2.6.2 -r1.1.1.2.6.3 src/dist/nvi/ex/ex_txt.c
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 src/dist/nvi/ex/version.h
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/dist/nvi/vi/v_ex.c
cvs rdiff -u -r1.1.1.2.6.1 -r1.1.1.2.6.2 src/dist/nvi/vi/v_increment.c
cvs rdiff -u -r1.1.1.2.6.3 -r1.1.1.2.6.4 src/dist/nvi/vi/v_txt.c

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

Modified files:

Index: src/dist/nvi/common/multibyte.h
diff -u src/dist/nvi/common/multibyte.h:1.1.1.2.6.2 src/dist/nvi/common/multibyte.h:1.1.1.2.6.3
--- src/dist/nvi/common/multibyte.h:1.1.1.2.6.2	Mon Apr 13 20:59:20 2009
+++ src/dist/nvi/common/multibyte.h	Sun Oct 18 09:58:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: multibyte.h,v 1.1.1.2.6.2 2009/04/13 20:59:20 snj Exp $ */
+/*	$NetBSD: multibyte.h,v 1.1.1.2.6.3 2009/10/18 09:58:03 sborrill Exp $ */
 
 #ifndef MULTIBYTE_H
 #define MULTIBYTE_H
@@ -24,6 +24,7 @@
 #define STRPBRK		wcspbrk
 #define TOUPPER		towupper
 #define STRSET		wmemset
+#define STRCHR		wcschr
 
 #define L(ch)		L ## ch
 
@@ -41,6 +42,7 @@
 #define STRPBRK		strpbrk
 #define TOUPPER		toupper
 #define STRSET		memset
+#define STRCHR		strchr
 
 #define L(ch)		ch
 

Index: src/dist/nvi/common/options.c
diff -u src/dist/nvi/common/options.c:1.3.2.2 src/dist/nvi/common/options.c:1.3.2.3
--- src/dist/nvi/common/options.c:1.3.2.2	Tue Jan 20 02:56:07 2009
+++ src/dist/nvi/common/options.c	Sun Oct 18 09:58:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: options.c,v 1.3.2.2 2009/01/20 02:56:07 snj Exp $ */
+/*	$NetBSD: options.c,v 1.3.2.3 2009/10/18 09:58:03 sborrill Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -84,8 +84,8 @@
 	{L(errorbells),	NULL,		OPT_0BOOL,	0},
 /* O_ESCAPETIME	  4.4BSD */
 	{L(escapetime),	NULL,		OPT_NUM,	0},
-/* O_EXPANDTABS	  NetBSD 5.0 */
-	{L(expandtabs),	NULL,		OPT_0BOOL,	0},
+/* O_EXPANDTAB	  NetBSD 5.0 */
+	{L(expandtab),	NULL,		OPT_0BOOL,	0},
 /* O_EXRC	System V (undocumented) */
 	{L(exrc),	NULL,		OPT_0BOOL,	0},
 /* O_EXTENDED	  4.4BSD */
@@ -267,6 +267,7 @@
 	{L(dir),	O_TMP_DIRECTORY},	/* 4BSD */
 	{L(eb),	O_ERRORBELLS},		/* 4BSD */
 	{L(ed),	O_EDCOMPATIBLE},	/* 4BSD */
+	{L(et),	O_EXPANDTAB},		/* NetBSD 5.0 */
 	{L(ex),	O_EXRC},		/* System V (undocumented) */
 #ifdef GTAGS
 	{L(gt),	O_GTAGSMODE},		/* FreeBSD, NetBSD */

Index: src/dist/nvi/ex/ex_shift.c
diff -u src/dist/nvi/ex/ex_shift.c:1.1.1.2.6.1 src/dist/nvi/ex/ex_shift.c:1.1.1.2.6.2
--- src/dist/nvi/ex/ex_shift.c:1.1.1.2.6.1	Tue Jan 20 02:56:07 2009
+++ src/dist/nvi/ex/ex_shift.c	Sun Oct 18 09:58:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ex_shift.c,v 1.1.1.2.6.1 2009/01/20 02:56:07 snj Exp $ */
+/*	$NetBSD: ex_shift.c,v 1.1.1.2.6.2 2009/10/18 09:58:03 sborrill Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -135,7 +135,7 @@
 		 */
 		tbp = bp;
 		newidx = 0;
-		if (!O_ISSET(sp, O_EXPANDTABS)) {
+		if (!O_ISSET(sp, O_EXPANDTAB)) {
 			for (; newcol = O_VAL(sp, O_TABSTOP); ++newidx) {
 *tbp++ = '\t';
 newcol -= O_VAL(sp, O_TABSTOP);

Index: src/dist/nvi/ex/ex_txt.c
diff -u src/dist/nvi/ex/ex_txt.c:1.1.1.2.6.2 src/dist/nvi/ex/ex_txt.c:1.1.1.2.6.3
--- src/dist/nvi/ex/ex_txt.c:1.1.1.2.6.2	Tue Jan 20 02:56:07 2009
+++ src/dist/nvi/ex/ex_txt.c	Sun Oct 18 09:58:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ex_txt.c,v 1.1.1.2.6.2 2009/01/20 02:56:07 snj Exp $ */
+/*	$NetBSD: ex_txt.c,v 1.1.1.2.6.3 2009/10/18 09:58:03 sborrill Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -407,7 +407,7 @@
 	 */
 	cno = 0;
 	tabs = 0;
-	if (!O_ISSET(sp, O_EXPANDTABS)) {
+	if (!O_ISSET(sp, O_EXPANDTAB)) {
 		for (; cno + COL_OFF(cno, ts) = scno; ++tabs)
 			cno += COL_OFF(cno, ts);
 	}

Index: src/dist/nvi/ex/version.h
diff -u src/dist/nvi/ex/version.h:1.1.1.1.8.1 src/dist/nvi/ex/version.h:1.1.1.1.8.2
---

CVS commit: [netbsd-5] src/doc

2009-10-18 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sun Oct 18 09:58:56 UTC 2009

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

Log Message:
Ticket 1068


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.115 -r1.1.2.116 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.115 src/doc/CHANGES-5.1:1.1.2.116
--- src/doc/CHANGES-5.1:1.1.2.115	Fri Oct 16 14:57:09 2009
+++ src/doc/CHANGES-5.1	Sun Oct 18 09:58:56 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.115 2009/10/16 14:57:09 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.116 2009/10/18 09:58:56 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14331,3 +14331,18 @@
 	Make the format for -k flag clearer.
 	[hubertf, ticket #1097]
 
+dist/nvi/common/multibyte.h			1.4
+dist/nvi/vi/v_increment.c			1.4
+dist/nvi/vi/v_ex.c1.4
+dist/nvi/common/options.c			1.6
+dist/nvi/ex/ex_shift.c1.3
+dist/nvi/ex/ex_txt.c1.4
+dist/nvi/ex/version.h1.4 via patch
+dist/nvi/vi/v_txt.c1.6
+
+	Update to nvi-1.81.6nb5:
+	- Make :ESC, #+ and #- work again.
+	- Rename expandtabs to expandtab to match documentation.
+	- Implement the et abbreviation for expandtab.
+	[aymeric, ticket #1068]
+

CVS commit: [netbsd-5] src/sys/arch/i386/pnpbios

2009-10-18 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sun Oct 18 10:07:10 UTC 2009

Modified Files:
src/sys/arch/i386/pnpbios [netbsd-5]: ess_pnpbios.c

Log Message:
Pull up the following revisions(s) (requested by snj in ticket #1098):
sys/arch/i386/pnpbios/ess_pnpbios.c:revision 1.19

Fix identification of ESS1878 on Fujitsu FMV-5100 NC/S by PnPBIOS. Fixes
PR/41629.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.10.1 src/sys/arch/i386/pnpbios/ess_pnpbios.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/pnpbios/ess_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.17 src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.17.10.1
--- src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.17	Mon Apr 28 20:23:25 2008
+++ src/sys/arch/i386/pnpbios/ess_pnpbios.c	Sun Oct 18 10:07:10 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ess_pnpbios.c,v 1.17 2008/04/28 20:23:25 martin Exp $	*/
+/*	$NetBSD: ess_pnpbios.c,v 1.17.10.1 2009/10/18 10:07:10 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ess_pnpbios.c,v 1.17 2008/04/28 20:23:25 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ess_pnpbios.c,v 1.17.10.1 2009/10/18 10:07:10 sborrill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -75,6 +75,7 @@
 	strcmp(aa-idstr, CPQB0AC)  /* 1869 */
 	strcmp(aa-idstr, CPQB0AD)  /* 1869 */
 	strcmp(aa-idstr, CPQB0F1)  /* 1869 */
+	strcmp(aa-idstr, ESS1878)  /* 1878 */
 	strcmp(aa-idstr, ESS1879))   /* 1879 */
 		return (0);

CVS commit: [netbsd-5] src/doc

2009-10-18 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sun Oct 18 10:07:47 UTC 2009

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

Log Message:
Ticket 1098


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.116 -r1.1.2.117 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.116 src/doc/CHANGES-5.1:1.1.2.117
--- src/doc/CHANGES-5.1:1.1.2.116	Sun Oct 18 09:58:56 2009
+++ src/doc/CHANGES-5.1	Sun Oct 18 10:07:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.116 2009/10/18 09:58:56 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.117 2009/10/18 10:07:47 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14346,3 +14346,9 @@
 	- Implement the et abbreviation for expandtab.
 	[aymeric, ticket #1068]
 
+sys/arch/i386/pnpbios/ess_pnpbios.c		1.19
+
+	Fix identification of ESS1878 on Fujitsu FMV-5100 NC/S
+	by PnPBIOS. Fixes PR/41629.
+	[snj, ticket #1098]
+

CVS commit: [netbsd-5] src

2009-10-18 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sun Oct 18 12:46:07 UTC 2009

Modified Files:
src/lib/libpuffs [netbsd-5]: dispatcher.c puffs.c puffs.h
src/sys/fs/puffs [netbsd-5]: puffs_msgif.h puffs_vnops.c

Log Message:
Pull up the following revisions(s) (requested by pooka in ticket #1100):
lib/libpuffs/dispatcher.c:  revision 1.33
lib/libpuffs/puffs.c:   revision 1.99
lib/libpuffs/puffs.h:   revision 1.111
sys/fs/puffs/puffs_msgif.h: revision 1.67 via patch
sys/fs/puffs/puffs_vnops.c: revision 1.136

Support VOP_ABORTOP() in puffs.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.4.1 src/lib/libpuffs/dispatcher.c
cvs rdiff -u -r1.92.4.2 -r1.92.4.3 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.108.4.2 -r1.108.4.3 src/lib/libpuffs/puffs.h
cvs rdiff -u -r1.65 -r1.65.20.1 src/sys/fs/puffs/puffs_msgif.h
cvs rdiff -u -r1.129.4.2 -r1.129.4.3 src/sys/fs/puffs/puffs_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/lib/libpuffs/dispatcher.c
diff -u src/lib/libpuffs/dispatcher.c:1.32 src/lib/libpuffs/dispatcher.c:1.32.4.1
--- src/lib/libpuffs/dispatcher.c:1.32	Tue Aug 12 19:44:39 2008
+++ src/lib/libpuffs/dispatcher.c	Sun Oct 18 12:46:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: dispatcher.c,v 1.32 2008/08/12 19:44:39 pooka Exp $	*/
+/*	$NetBSD: dispatcher.c,v 1.32.4.1 2009/10/18 12:46:07 sborrill Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007, 2008 Antti Kantee.  All Rights Reserved.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #if !defined(lint)
-__RCSID($NetBSD: dispatcher.c,v 1.32 2008/08/12 19:44:39 pooka Exp $);
+__RCSID($NetBSD: dispatcher.c,v 1.32.4.1 2009/10/18 12:46:07 sborrill Exp $);
 #endif /* !lint */
 
 #include sys/types.h
@@ -828,6 +828,24 @@
 			break;
 		}
 
+		case PUFFS_VN_ABORTOP:
+		{
+			struct puffs_vnmsg_abortop *auxt = auxbuf;
+			struct puffs_cn pcn;
+
+			if (pops-puffs_node_abortop == NULL) {
+error = 0;
+break;
+			}
+
+			pcn.pcn_pkcnp = auxt-pvnr_cn;
+			PUFFS_KCREDTOCRED(pcn.pcn_cred, auxt-pvnr_cn_cred);
+
+			error = pops-puffs_node_abortop(pu, opcookie, pcn);
+
+			break;
+		}
+
 		case PUFFS_VN_READ:
 		{
 			struct puffs_vnmsg_read *auxt = auxbuf;
@@ -896,6 +914,8 @@
 			break;
 		}
 
+#if 0
+	/* not issued by kernel currently */
 	} else if (PUFFSOP_OPCLASS(preq-preq_opclass) == PUFFSOP_CACHE) {
 		struct puffs_cacheinfo *pci = (void *)preq;
 
@@ -904,6 +924,7 @@
 			pci-pcache_nruns, pci-pcache_runs);
 		}
 		error = 0;
+#endif
 
 	} else if (PUFFSOP_OPCLASS(preq-preq_opclass) == PUFFSOP_ERROR) {
 		struct puffs_error *perr = (void *)preq;

Index: src/lib/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.92.4.2 src/lib/libpuffs/puffs.c:1.92.4.3
--- src/lib/libpuffs/puffs.c:1.92.4.2	Fri Oct 16 12:10:54 2009
+++ src/lib/libpuffs/puffs.c	Sun Oct 18 12:46:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.c,v 1.92.4.2 2009/10/16 12:10:54 sborrill Exp $	*/
+/*	$NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #if !defined(lint)
-__RCSID($NetBSD: puffs.c,v 1.92.4.2 2009/10/16 12:10:54 sborrill Exp $);
+__RCSID($NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $);
 #endif /* !lint */
 
 #include sys/param.h
@@ -99,6 +99,7 @@
 	FILLOP(print,PRINT);
 	FILLOP(read, READ);
 	FILLOP(write,WRITE);
+	FILLOP(abortop,  ABORTOP);
 }
 #undef FILLOP
 
@@ -584,21 +585,15 @@
 	return rv;
 }
 
+/*ARGSUSED*/
 struct puffs_usermount *
-_puffs_init(int develv, struct puffs_ops *pops, const char *mntfromname,
+_puffs_init(int dummy, struct puffs_ops *pops, const char *mntfromname,
 	const char *puffsname, void *priv, uint32_t pflags)
 {
 	struct puffs_usermount *pu;
 	struct puffs_kargs *pargs;
 	int sverrno;
 
-	if (develv != PUFFS_DEVEL_LIBVERSION) {
-		warnx(puffs_init: mounting with lib version %d, need %d,
-		develv, PUFFS_DEVEL_LIBVERSION);
-		errno = EINVAL;
-		return NULL;
-	}
-
 	pu = malloc(sizeof(struct puffs_usermount));
 	if (pu == NULL)
 		goto failfree;

Index: src/lib/libpuffs/puffs.h
diff -u src/lib/libpuffs/puffs.h:1.108.4.2 src/lib/libpuffs/puffs.h:1.108.4.3
--- src/lib/libpuffs/puffs.h:1.108.4.2	Fri Oct 16 12:10:54 2009
+++ src/lib/libpuffs/puffs.h	Sun Oct 18 12:46:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.h,v 1.108.4.2 2009/10/16 12:10:54 sborrill Exp $	*/
+/*	$NetBSD: puffs.h,v 1.108.4.3 2009/10/18 12:46:07 sborrill Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -218,10 +218,13 @@
 	uint8_t *, off_t, size_t *, const struct puffs_cred *, int);
 	int (*puffs_node_write)(struct puffs_usermount *, puffs_cookie_t,
 	uint8_t *, off_t, size_t *, const struct puffs_cred *, int);
+	int (*puffs_node_abortop)(struct puffs_usermount *, puffs_cookie_t,
+	const struct puffs_cn *);
 
-	/*

CVS commit: [netbsd-5] src/doc

2009-10-18 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sun Oct 18 12:46:42 UTC 2009

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

Log Message:
Ticket 1100


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.117 -r1.1.2.118 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.117 src/doc/CHANGES-5.1:1.1.2.118
--- src/doc/CHANGES-5.1:1.1.2.117	Sun Oct 18 10:07:47 2009
+++ src/doc/CHANGES-5.1	Sun Oct 18 12:46:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.117 2009/10/18 10:07:47 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.118 2009/10/18 12:46:42 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14352,3 +14352,12 @@
 	by PnPBIOS. Fixes PR/41629.
 	[snj, ticket #1098]
 
+lib/libpuffs/dispatcher.c			1.33
+lib/libpuffs/puffs.c1.99
+lib/libpuffs/puffs.h1.111
+sys/fs/puffs/puffs_msgif.h			1.67 via patch
+sys/fs/puffs/puffs_vnops.c			1.136
+
+	Support VOP_ABORTOP() in puffs.
+	[pooka, ticket #1100]
+

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 13:23:31 UTC 2009

Modified Files:
src/sys/dev/sbus [netbsd-5]: files.sbus zx.c zxreg.h zxvar.h

Log Message:
Pull up following revision(s) (requested by macallan in ticket #960):
sys/dev/sbus/zxreg.h: revision 1.7
sys/dev/sbus/files.sbus: revision 1.32
sys/dev/sbus/zxvar.h: revision 1.4
sys/dev/sbus/zx.c: revision 1.27
Add wscons support


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.36.1 src/sys/dev/sbus/files.sbus
cvs rdiff -u -r1.24.6.1 -r1.24.6.2 src/sys/dev/sbus/zx.c
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 src/sys/dev/sbus/zxreg.h
cvs rdiff -u -r1.2.10.1 -r1.2.10.2 src/sys/dev/sbus/zxvar.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/sbus/files.sbus
diff -u src/sys/dev/sbus/files.sbus:1.31 src/sys/dev/sbus/files.sbus:1.31.36.1
--- src/sys/dev/sbus/files.sbus:1.31	Sun Aug 26 00:39:39 2007
+++ src/sys/dev/sbus/files.sbus	Sun Oct 18 13:23:31 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sbus,v 1.31 2007/08/26 00:39:39 macallan Exp $
+#	$NetBSD: files.sbus,v 1.31.36.1 2009/10/18 13:23:31 bouyer Exp $
 #
 # Config file and device description for machine-independent SBUS code.
 # Included by ports that need it.
@@ -119,7 +119,7 @@
 attach	tcx at sbus
 file	dev/sbus/tcx.c			tcx needs-flag
 
-device	zx: fb, rasops32
+device	zx: fb, rasops32, wsemuldisplaydev, vcons
 attach	zx at sbus
 file	dev/sbus/zx.c			zx
 

Index: src/sys/dev/sbus/zx.c
diff -u src/sys/dev/sbus/zx.c:1.24.6.1 src/sys/dev/sbus/zx.c:1.24.6.2
--- src/sys/dev/sbus/zx.c:1.24.6.1	Fri Apr  3 17:45:31 2009
+++ src/sys/dev/sbus/zx.c	Sun Oct 18 13:23:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: zx.c,v 1.24.6.1 2009/04/03 17:45:31 snj Exp $	*/
+/*	$NetBSD: zx.c,v 1.24.6.2 2009/10/18 13:23:31 bouyer Exp $	*/
 
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.24.6.1 2009/04/03 17:45:31 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.24.6.2 2009/10/18 13:23:31 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -66,45 +66,58 @@
 #include dev/sun/fbio.h
 #include dev/sun/fbvar.h
 
+#include wsdisplay.h
+#if NWSDISPLAY  0
+#include dev/wscons/wsconsio.h
+#include dev/wsfont/wsfont.h
+#include dev/rasops/rasops.h
+#include dev/wscons/wsdisplay_vconsvar.h
+
+#include opt_wsemul.h
+#endif
+
 #include dev/sbus/zxreg.h
 #include dev/sbus/zxvar.h
 #include dev/sbus/sbusvar.h
 
 #include dev/wscons/wsconsio.h
 
-#ifndef RASTERCONSOLE
-#error Sorry, this driver needs the RASTERCONSOLE option
+#if (NWSDISPLAY == 0)  !defined(RASTERCONSOLE)
+#error Sorry, this driver needs WSCONS or RASTERCONSOLE
+#endif
+
+#if (NWSDISPLAY  0)  defined(RASTERCONSOLE)
+#error Sorry, RASTERCONSOLE and WSCONS are mutually exclusive
 #endif
 
 #define	ZX_STD_ROP	(ZX_ROP_NEW | ZX_ATTR_WE_ENABLE | \
 ZX_ATTR_OE_ENABLE | ZX_ATTR_FORCE_WID)
 
-void	zx_attach(struct device *, struct device *, void *);
-int	zx_match(struct device *, struct cfdata *, void *);
+static void	zx_attach(device_t, device_t, void *);
+static int	zx_match(device_t, struct cfdata *, void *);
 
-void	zx_blank(struct device *);
-int	zx_cmap_put(struct zx_softc *);
-void	zx_copyrect(struct rasops_info *, int, int, int, int, int, int);
-int	zx_cross_loadwid(struct zx_softc *, u_int, u_int, u_int);
-int	zx_cross_wait(struct zx_softc *);
-void	zx_fillrect(struct rasops_info *, int, int, int, int, long, int);
-int	zx_intr(void *);
-void	zx_reset(struct zx_softc *);
-void	zx_unblank(struct device *);
-
-void	zx_cursor_blank(struct zx_softc *);
-void	zx_cursor_color(struct zx_softc *);
-void	zx_cursor_move(struct zx_softc *);
-void	zx_cursor_set(struct zx_softc *);
-void	zx_cursor_unblank(struct zx_softc *);
-
-void	zx_copycols(void *, int, int, int, int);
-void	zx_copyrows(void *, int, int, int);
-void	zx_cursor(void *, int, int, int);
-void	zx_do_cursor(struct rasops_info *);
-void	zx_erasecols(void *, int, int, int, long);
-void	zx_eraserows(void *, int, int, long);
-void	zx_putchar(void *, int, int, u_int, long);
+static void	zx_blank(device_t);
+static int	zx_cmap_put(struct zx_softc *);
+static void	zx_copyrect(struct zx_softc *, int, int, int, int, int, int);
+static int	zx_cross_loadwid(struct zx_softc *, u_int, u_int, u_int);
+static int	zx_cross_wait(struct zx_softc *);
+static void	zx_fillrect(struct zx_softc *, int, int, int, int, uint32_t, int);
+static int	zx_intr(void *);
+static void	zx_reset(struct zx_softc *);
+static void	zx_unblank(device_t);
+
+static void	zx_cursor_blank(struct zx_softc *);
+static void	zx_cursor_color(struct zx_softc *);
+static void	zx_cursor_move(struct zx_softc *);
+static void	zx_cursor_set(struct zx_softc *);
+static void	zx_cursor_unblank(struct zx_softc *);
+
+static void	zx_copycols(void *, int, int, int, int);
+static void	zx_copyrows(void *, int, int, int);
+static

CVS commit: [netbsd-5] src/etc/etc.sparc

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 13:27:34 UTC 2009

Modified Files:
src/etc/etc.sparc [netbsd-5]: ttys

Log Message:
Pull up following revision(s) (requested by macallan in ticket #961):
etc/etc.sparc/ttys: revision 1.15
do as sparc64 does


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 src/etc/etc.sparc/ttys

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

Modified files:

Index: src/etc/etc.sparc/ttys
diff -u src/etc/etc.sparc/ttys:1.14 src/etc/etc.sparc/ttys:1.14.2.1
--- src/etc/etc.sparc/ttys:1.14	Tue Oct  7 10:00:02 2008
+++ src/etc/etc.sparc/ttys	Sun Oct 18 13:27:34 2009
@@ -1,10 +1,16 @@
-#	$NetBSD: ttys,v 1.14 2008/10/07 10:00:02 abs Exp $
+#	$NetBSD: ttys,v 1.14.2.1 2009/10/18 13:27:34 bouyer Exp $
 #
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # name	gettytype	status		comments
 #
-console	/usr/libexec/getty suncons	sun	on secure
-constty	/usr/libexec/getty suncons	sun	off secure
+console	/usr/libexec/getty suncons	sun-ss5	on secure
+constty	/usr/libexec/getty suncons	sun-ss5	off secure
+ttyE0	/usr/libexec/getty suncons	sun-ss5	off secure
+ttyE1	/usr/libexec/getty suncons	sun-ss5	off secure
+ttyE2	/usr/libexec/getty suncons	sun-ss5	off secure
+ttyE3	/usr/libexec/getty suncons	sun-ss5	off secure
 ttya	/usr/libexec/getty std.9600	unknown	off secure
 ttyb	/usr/libexec/getty std.9600	unknown	off secure
+ttyh0   /usr/libexec/getty std.9600   unknown off secure
+ttyh1   /usr/libexec/getty std.9600   unknown off secure

CVS commit: [netbsd-5] src/sys/arch/sparc/conf

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 13:33:29 UTC 2009

Modified Files:
src/sys/arch/sparc/conf [netbsd-5]: GENERIC

Log Message:
Pull up following revision(s) (requested by macallan in ticket #965):
sys/arch/sparc/conf/GENERIC: revision 1.208
wscons here we come!
(finally)


To generate a diff of this commit:
cvs rdiff -u -r1.205.4.1 -r1.205.4.2 src/sys/arch/sparc/conf/GENERIC

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

Modified files:

Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.205.4.1 src/sys/arch/sparc/conf/GENERIC:1.205.4.2
--- src/sys/arch/sparc/conf/GENERIC:1.205.4.1	Fri Oct 16 06:30:01 2009
+++ src/sys/arch/sparc/conf/GENERIC	Sun Oct 18 13:33:29 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.205.4.1 2009/10/16 06:30:01 snj Exp $
+# $NetBSD: GENERIC,v 1.205.4.2 2009/10/18 13:33:29 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.205.4.1 $
+#ident 		GENERIC-$Revision: 1.205.4.2 $
 
 maxusers	32
 
@@ -45,14 +45,30 @@
 
 ## Use a faster console than the PROM's slow drawing routines.  Not needed
 ## for headless (no framebuffer) machines.
-options 	RASTERCONSOLE		# fast rasterop console
-options 	FONT_GALLANT12x22	# the console font
-#options 	FONT_BOLD8x16		# a somewhat smaller font
-## default console colors: black-on-white; this can be changed
-## using the following two options.
+## These is obsolete for wscons kernels
+#options 	RASTERCONSOLE		# fast rasterop console
 #options 	RASTERCONSOLE_FGCOL=WSCOL_BLACK
 #options 	RASTERCONSOLE_BGCOL=WSCOL_WHITE
 
+# wscons stuff
+options		WSEMUL_SUN
+#options		WSEMUL_VT100
+options		WSDISPLAY_COMPAT_RAWKBD
+options		WSDISPLAY_CUSTOM_OUTPUT
+options		WS_DEFAULT_FG=WSCOL_BLACK
+options		WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
+options		WS_KERNEL_FG=WSCOL_GREEN
+options		WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+options		WSDISPLAY_COMPAT_PCVT
+options 	WSDISPLAY_COMPAT_SYSCONS
+options		WSDISPLAY_COMPAT_USL
+
+options		WSDISPLAY_SCROLLSUPPORT
+
+# generic options vlid for both wscons and RASTERCONSOLE
+options 	FONT_GALLANT12x22	# the console font
+#options 	FONT_BOLD8x16		# a somewhat smaller font
+
  System options that are the same for all ports
 
 ## Root device configuration: change the ?'s if you are going to use a
@@ -316,16 +332,23 @@
 zs0	at obio0 addr 0xf100 level 12		# sun4/200 and sun4/300
 zs0	at obio0 addr 0x0100 level 12		# sun4/100
 zs0	at bootbus0	# sun4d
-zstty0	at zs0 channel 0# ttya
-zstty1	at zs0 channel 1# ttyb
 
 zs1	at mainbus0	# sun4c
 zs1	at obio0	# sun4m
 zs1	at obio0 addr 0xf000 level 12		# sun4/200 and sun4/300
 zs1	at obio0 addr 0x level 12		# sun4/100
 zs1	at bootbus0	# sun4d
-kbd0	at zs1 channel 0# keyboard
-ms0	at zs1 channel 1# mouse
+
+# old kbd and mouse attachments
+#kbd0	at zs1 channel 0# keyboard
+#ms0	at zs1 channel 1# mouse
+zstty*	at zs?
+
+# these are for wscons
+kbd0	at zstty?
+ms0	at zstty?
+wskbd*	at wskbddev?
+wsmouse* 	at wsmousedev?
 
 zs2	at obio0 addr 0xe000 level 12		# sun4/300
 zstty2	at zs2 channel 0# ttyc
@@ -637,7 +660,8 @@
 bwtwo0		at obio0 addr 0x0b30 level 4	# sun4/100 in P4 slot
 
 ## Sun cgtwo VME color framebuffer
-cgtwo0		at vme0 addr 0x40 irq ? vect 0xa8
+# XXX no wsdisplay support
+#cgtwo0		at vme0 addr 0x40 irq ? vect 0xa8
 
 ## Sun cgthree Sbus color framebuffer
 cgthree0	at sbus? slot ? offset ?
@@ -646,8 +670,9 @@
 
 ## Sun cgfour color framebuffer with overlay plane.  See above comment
 ## regarding overlay plane.
-cgfour0		at obio0 addr 0xfb30 level 4	# sun4/300 P4
-cgfour0		at obio0 addr 0x0b30 level 4	# sun4/100 P4
+# XXX no wsdisplay support
+#cgfour0		at obio0 addr 0xfb30 level 4	# sun4/300 P4
+#cgfour0		at obio0 addr 0x0b30 level 4	# sun4/100 P4
 
 ## Sun cgsix accelerated color framebuffer.
 cgsix0		at sbus? slot ? offset ?
@@ -656,21 +681,31 @@
 cgsix0		at obio0 addr 0x0b00 level 4	# sun4/100 P4
 
 ## Sun cgeight 24-bit framebuffer
-cgeight0 	at obio0 addr 0xfb30 level 4	# sun4/300 P4
-cgeight0	at obio0 addr 0x0b30 level 4	# sun4/100 P4
+# XXX no wsdisplay support
+#cgeight0 	at obio0 addr 0xfb30 level 4	# sun4/300 P4
+#cgeight0	at obio0 addr 0x0b30 level 4	# sun4/100 P4
 
 ## Sun tcx accelerated color framebuffer.
-tcx0		at sbus? slot ? offset ?
-tcx*		at sbus? slot ? offset ?
+# XXX no wsdisplay support
+#tcx0		at sbus? slot ? offset ?
+#tcx*		at sbus? slot ? offset ?
 
 # Sun cgfourteen accelerated 24-bit framebuffer.
-cgfourteen0	at obio0			# sun4m
+cgfourteen*	at obio0			# sun4m
 
 # P9100-based display on Tadpole SPARCbook 3.
 pnozz0		at sbus? slot ? offset ?
 
 # Sun ZX/Leo 24-bit framebuffer
-zx*		at sbus? slot ? offset ?
+# XXX no wsdisplay support
+#zx*		at sbus? slot ? offset ?
+
+# Fujitsu AG-10e

CVS commit: [netbsd-5] src/sys/arch/sparc64/include

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 13:34:49 UTC 2009

Modified Files:
src/sys/arch/sparc64/include [netbsd-5]: bus.h

Log Message:
Pull up following revision(s) (requested by macallan in ticket #967):
sys/arch/sparc64/include/bus.h: revision 1.59
again


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.58.10.1 src/sys/arch/sparc64/include/bus.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/sparc64/include/bus.h
diff -u src/sys/arch/sparc64/include/bus.h:1.58 src/sys/arch/sparc64/include/bus.h:1.58.10.1
--- src/sys/arch/sparc64/include/bus.h:1.58	Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc64/include/bus.h	Sun Oct 18 13:34:49 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.58 2008/04/28 20:23:36 martin Exp $	*/
+/*	$NetBSD: bus.h,v 1.58.10.1 2009/10/18 13:34:49 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -307,7 +307,8 @@
 #define	BUS_SPACE_MAP_BUS2		0x0200
 #define	BUS_SPACE_MAP_BUS3		0x0400
 #define	BUS_SPACE_MAP_BUS4		0x0800
-
+/* sparc uses this, it's not supposed to do anything on sparc64 */
+#define BUS_SPACE_MAP_LARGE		0
 
 /* flags for bus_space_barrier() */
 #define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */

CVS commit: [netbsd-5] src/sys/arch/sparc/conf

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 13:35:29 UTC 2009

Modified Files:
src/sys/arch/sparc/conf [netbsd-5]: INSTALL

Log Message:
Pull up following revision(s) (requested by macallan in ticket #968):
sys/arch/sparc/conf/INSTALL: revision 1.64
convert to wscons, while there add some missing wsdisplay drivers


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.4.1 src/sys/arch/sparc/conf/INSTALL

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/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.62 src/sys/arch/sparc/conf/INSTALL:1.62.4.1
--- src/sys/arch/sparc/conf/INSTALL:1.62	Thu Jul 31 07:41:07 2008
+++ src/sys/arch/sparc/conf/INSTALL	Sun Oct 18 13:35:29 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.62 2008/07/31 07:41:07 simonb Exp $
+#	$NetBSD: INSTALL,v 1.62.4.1 2009/10/18 13:35:29 bouyer Exp $
 #
 # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 #
@@ -47,6 +47,16 @@
 #options 	RASTERCONSOLE_FGCOL=WSCOL_BLACK
 #options 	RASTERCONSOLE_BGCOL=WSCOL_WHITE
 
+# wscons stuff
+options		WSEMUL_SUN
+#options		WSEMUL_VT100
+options		WSDISPLAY_COMPAT_RAWKBD
+options		WSDISPLAY_CUSTOM_OUTPUT
+options		WS_DEFAULT_FG=WSCOL_BLACK
+options		WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
+options		WS_KERNEL_FG=WSCOL_GREEN
+options		WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+
  System options that are the same for all ports
 
 ## Root device configuration: change the ?'s if you are going to use a
@@ -270,20 +280,21 @@
 zs0	at obio0	# sun4m
 zs0	at obio0 addr 0xf100 level 12 flags 0x103	# sun4/200 and sun4/300
 zs0	at obio0 addr 0x0100 level 12 flags 0x103	# sun4/100
-zstty0	at zs0 channel 0	# ttya
-zstty1	at zs0 channel 1	# ttyb
 
 zs1	at mainbus0	# sun4c
 zs1	at obio0	# sun4m
 zs1	at obio0 addr 0xf000 level 12 flags 0x103	# sun4/200 and sun4/300
 zs1	at obio0 addr 0x level 12 flags 0x103	# sun4/100
-kbd0	at zs1 channel 0	# keyboard
-ms0	at zs1 channel 1	# mouse
 
-zs2	at obio0 addr 0xe000 level 12 flags 0x103	# sun4/300
-zstty2	at zs2 channel 0	# ttyc
-zstty3	at zs2 channel 1	# ttyd
+zs2	at obio0 addr 0xe000 level 12		# sun4/300
+
+zstty*	at zs?
 
+# these are for wscons
+kbd0	at zstty?
+ms0	at zstty?
+wskbd*	at wskbddev?
+wsmouse* 	at wsmousedev?
 
 ## Magma Serial/Parallel driver
 #magma*	at sbus? slot ? offset ?
@@ -545,12 +556,28 @@
 #cgeight0	at obio0 addr 0x0b30 level 4	# sun4/100 P4
 
 ## Sun tcx accelerated color framebuffer.
-tcx0		at sbus? slot ? offset ?
-tcx*		at sbus? slot ? offset ?
+#tcx0		at sbus? slot ? offset ?
+#tcx*		at sbus? slot ? offset ?
 
 # Sun cgfourteen accelerated 24-bit framebuffer.
-cgfourteen0	at obio0			# sun4m
+cgfourteen*	at obio0			# sun4m
+
+# P9100-based display on Tadpole SPARCbook 3.
+pnozz0		at sbus? slot ? offset ?
+
+# Sun ZX/Leo 24-bit framebuffer
+# XXX no wsdisplay support
+#zx*		at sbus? slot ? offset ?
 
+# Fujitsu AG-10e accelerated graphics 8/24-bit board
+agten*	at sbus? slot ? offset ?
+
+# generic framebuffer console
+genfb*	at sbus? slot ? offset ?
+
+# make sure wsdisplay0 is the console
+wsdisplay0	at wsemuldisplaydev? console 1
+wsdisplay*	at wsemuldisplaydev?
 
  Other device configuration
 
@@ -563,3 +590,6 @@
 
 pseudo-device	rnd
 #pseudo-device	fss		4	# file system snapshot device
+
+pseudo-device	wsmux			# mouse and keyboard multiplexor
+pseudo-device	wsfont

CVS commit: [netbsd-5] src/sys/arch/sparc

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 13:43:46 UTC 2009

Modified Files:
src/sys/arch/sparc/include [netbsd-5]: bus.h
src/sys/arch/sparc/sparc [netbsd-5]: machdep.c

Log Message:
Pull up following revision(s) (requested by macallan in ticket #969):
sys/arch/sparc/include/bus.h: revision 1.56
sys/arch/sparc/sparc/machdep.c: revision 1.294
do as phone suggested - remove sparc_bus_map_large() again and use a =20=
flag
instead ( BUS_SPACE_MAP_LARGE )


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.54.10.1 src/sys/arch/sparc/include/bus.h
cvs rdiff -u -r1.282.4.1 -r1.282.4.2 src/sys/arch/sparc/sparc/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/sparc/include/bus.h
diff -u src/sys/arch/sparc/include/bus.h:1.54 src/sys/arch/sparc/include/bus.h:1.54.10.1
--- src/sys/arch/sparc/include/bus.h:1.54	Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/include/bus.h	Sun Oct 18 13:43:45 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.54 2008/04/28 20:23:36 martin Exp $	*/
+/*	$NetBSD: bus.h,v 1.54.10.1 2009/10/18 13:43:45 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -245,6 +245,7 @@
 void (*)(void));	/*optional fast vector*/
 
 
+
 static __inline int
 bus_space_map(t, a, s, f, hp)
 	bus_space_tag_t	t;
@@ -352,7 +353,7 @@
 #define BUS_SPACE_MAP_BUS1	0x0100	/* placeholders for bus functions... */
 #define BUS_SPACE_MAP_BUS2	0x0200
 #define BUS_SPACE_MAP_BUS3	0x0400
-#define BUS_SPACE_MAP_BUS4	0x0800
+#define BUS_SPACE_MAP_LARGE	0x0800	/* map outside IODEV range */
 
 
 /* flags for bus_space_barrier() */

Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.282.4.1 src/sys/arch/sparc/sparc/machdep.c:1.282.4.2
--- src/sys/arch/sparc/sparc/machdep.c:1.282.4.1	Mon Feb  2 03:30:33 2009
+++ src/sys/arch/sparc/sparc/machdep.c	Sun Oct 18 13:43:45 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.282.4.1 2009/02/02 03:30:33 snj Exp $ */
+/*	$NetBSD: machdep.c,v 1.282.4.2 2009/10/18 13:43:45 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.282.4.1 2009/02/02 03:30:33 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.282.4.2 2009/10/18 13:43:45 bouyer Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_compat_sunos.h
@@ -2127,8 +2127,8 @@
 	return (EINVAL);
 }
 
-int
-sparc_bus_map(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
+static int
+sparc_bus_map_iodev(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
 	  vaddr_t va, bus_space_handle_t *hp)
 {
 	vaddr_t v;
@@ -2194,11 +2194,44 @@
 	return (0);
 }
 
+static int
+sparc_bus_map_large(bus_space_tag_t t, bus_addr_t ba,
+		bus_size_t size, int flags, bus_space_handle_t *hp)
+{
+	vaddr_t v = 0;
+
+	if (uvm_map(kernel_map, v, size, NULL, 0, PAGE_SIZE,
+	UVM_MAPFLAG(UVM_PROT_RW, UVM_PROT_RW, UVM_INH_SHARE, UVM_ADV_NORMAL,
+			0)) == 0) {
+		return sparc_bus_map_iodev(t, ba, size, flags, v, hp);
+	}
+	return -1;
+}
+
+int
+sparc_bus_map(bus_space_tag_t t, bus_addr_t ba,
+		bus_size_t size, int flags, vaddr_t va,
+		bus_space_handle_t *hp)
+{
+
+	if (flags  BUS_SPACE_MAP_LARGE) {
+		return sparc_bus_map_large(t, ba, size, flags, hp);
+	} else
+		return sparc_bus_map_iodev(t, ba, size, flags, va, hp);
+		
+}
+
 int
 sparc_bus_unmap(bus_space_tag_t t, bus_space_handle_t bh, bus_size_t size)
 {
 	vaddr_t va = trunc_page((vaddr_t)bh);
 
+	/*
+	 * XXX
+	 * mappings with BUS_SPACE_MAP_LARGE need additional care here
+	 * we can just check if the VA is in the IODEV range
+	 */
+
 	pmap_kremove(va, round_page(size));
 	pmap_update(pmap_kernel());
 	return (0);

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 13:45:50 UTC 2009

Modified Files:
src/sys/arch/sparc64/dev [netbsd-5]: ffb.c

Log Message:
Pull up following revision(s) (requested by macallan in ticket #972):
sys/arch/sparc64/dev/ffb.c: revision 1.37
call vcons_replay_msgbuf() when appropriate


To generate a diff of this commit:
cvs rdiff -u -r1.35.4.1 -r1.35.4.2 src/sys/arch/sparc64/dev/ffb.c

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

Modified files:

Index: src/sys/arch/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.35.4.1 src/sys/arch/sparc64/dev/ffb.c:1.35.4.2
--- src/sys/arch/sparc64/dev/ffb.c:1.35.4.1	Wed Feb 25 20:52:09 2009
+++ src/sys/arch/sparc64/dev/ffb.c	Sun Oct 18 13:45:50 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffb.c,v 1.35.4.1 2009/02/25 20:52:09 snj Exp $	*/
+/*	$NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $	*/
 /*	$OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.35.4.1 2009/02/25 20:52:09 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -239,11 +239,12 @@
 	sc-sc_fb.fb_device = sc-sc_dv;
 	fb_attach(sc-sc_fb, sc-sc_console);
 
+	ffb_clearscreen(sc);
+
 	if (sc-sc_console) {
 		wsdisplay_cnattach(ffb_stdscreen, ri, 0, 0, defattr);
+		vcons_replay_msgbuf(ffb_console_screen);
 	}
-
-	ffb_clearscreen(sc);
 	
 	waa.console = sc-sc_console;
 	waa.scrdata = ffb_screenlist;
@@ -433,7 +434,6 @@
 		break;
 #endif
 	}
-
 	return (-1);
 }

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 13:58:41 UTC 2009

Modified Files:
src/sys/dev/sun [netbsd-5]: cgsix.c

Log Message:
Pull up following revision(s) (requested by macallan in ticket #978):
sys/dev/sun/cgsix.c: revision 1.45
call vcons_replay_msgbuf() when appropriate


To generate a diff of this commit:
cvs rdiff -u -r1.38.6.5 -r1.38.6.6 src/sys/dev/sun/cgsix.c

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

Modified files:

Index: src/sys/dev/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.38.6.5 src/sys/dev/sun/cgsix.c:1.38.6.6
--- src/sys/dev/sun/cgsix.c:1.38.6.5	Mon Mar  2 19:56:34 2009
+++ src/sys/dev/sun/cgsix.c	Sun Oct 18 13:58:41 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgsix.c,v 1.38.6.5 2009/03/02 19:56:34 snj Exp $ */
+/*	$NetBSD: cgsix.c,v 1.38.6.6 2009/10/18 13:58:41 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.38.6.5 2009/03/02 19:56:34 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.38.6.6 2009/10/18 13:58:41 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -616,6 +616,9 @@
 	vcons_init(sc-vd, sc, cgsix_defaultscreen, cgsix_accessops);
 	sc-vd.init_screen = cgsix_init_screen;
 
+	cg6_setup_palette(sc);
+	cgsix_clearscreen(sc);
+
 	if(isconsole) {
 		/* we mess with cg6_console_screen only once */
 		vcons_init_screen(sc-vd, cg6_console_screen, 1,
@@ -628,7 +631,8 @@
 		cgsix_defaultscreen.ncols = ri-ri_cols;
 		SCREEN_VISIBLE(cg6_console_screen);
 		sc-vd.active = cg6_console_screen;
-		wsdisplay_cnattach(cgsix_defaultscreen, ri, 0, 0, defattr);	
+		wsdisplay_cnattach(cgsix_defaultscreen, ri, 0, 0, defattr);
+		vcons_replay_msgbuf(cg6_console_screen);
 	} else {
 		/* 
 		 * we're not the console so we just clear the screen and don't 
@@ -649,9 +653,6 @@
 			cgsix_defaultscreen.ncols = ri-ri_cols;
 		}
 	}
-
-	cg6_setup_palette(sc);
-	cgsix_clearscreen(sc);
 	
 	aa.scrdata = cgsix_screenlist;
 	aa.console = isconsole;

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:00:07 UTC 2009

Modified Files:
src/sys/dev/sun [netbsd-5]: fbio.h

Log Message:
Pull up following revision(s) (requested by macallan in ticket #991):
sys/dev/sun/fbio.h: revision 1.10
add FBTYPE_SUNTCX - forgot to commit that along with the tcx(8) update
found by he@


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.74.1 src/sys/dev/sun/fbio.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/sun/fbio.h
diff -u src/sys/dev/sun/fbio.h:1.8 src/sys/dev/sun/fbio.h:1.8.74.1
--- src/sys/dev/sun/fbio.h:1.8	Thu Apr 13 13:30:25 2006
+++ src/sys/dev/sun/fbio.h	Sun Oct 18 14:00:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: fbio.h,v 1.8 2006/04/13 13:30:25 macallan Exp $ */
+/*	$NetBSD: fbio.h,v 1.8.74.1 2009/10/18 14:00:07 bouyer Exp $ */
 
 /*
  * Copyright (c) 1992 Regents of the University of California.
@@ -72,8 +72,10 @@
 #define	FBTYPE_P9100		21	/* tadpole 3gx p9100 controller */
 #define FBTYPE_CREATOR		22	/* ffb creator or elite */
 #define FBTYPE_GENERIC_PCI	23	/* machfb, ofb and so on */
+#define FBTYPE_AG10E		24	/* Fujitsu AG-10e */
+#define FBTYPE_SUNTCX		25	/* Sun TCX, S24  */
 
-#define	FBTYPE_LASTPLUSONE	24	/* max number of fbs (change as add) */
+#define	FBTYPE_LASTPLUSONE	26	/* max number of fbs (change as add) */
 
 /*
  * XXX These really shouldn't be here, but this is what the pmax

CVS commit: [netbsd-5] src/sys/arch/sparc/conf

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:01:50 UTC 2009

Modified Files:
src/sys/arch/sparc/conf [netbsd-5]: MRCOFFEE

Log Message:
Pull up following revision(s) (requested by macallan in ticket #990):
sys/arch/sparc/conf/MRCOFFEE: revision 1.29
add the missing wscons bits so this kernel builds again
needs testing on actual hardware which I don't have.


To generate a diff of this commit:
cvs rdiff -u -r1.23.20.1 -r1.23.20.2 src/sys/arch/sparc/conf/MRCOFFEE

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/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.1 src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.2
--- src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.1	Fri Oct 16 06:30:02 2009
+++ src/sys/arch/sparc/conf/MRCOFFEE	Sun Oct 18 14:01:49 2009
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.23.20.1 2009/10/16 06:30:02 snj Exp $
+# $NetBSD: MRCOFFEE,v 1.23.20.2 2009/10/18 14:01:49 bouyer Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		MRCOFFEE-$Revision: 1.23.20.1 $
+#ident 		MRCOFFEE-$Revision: 1.23.20.2 $
 
 maxusers	32
 
@@ -29,16 +29,21 @@
 # Blink the power LED on some machines to indicate the system load.
 #options 	BLINK
 
-# XXX: uwe: TCX driver doesn't support RASTERCONSOLE, so don't bother
-## Use a faster console than the PROM's slow drawing routines.  Not needed
-## for headless (no framebuffer) machines.
-#options 	RASTERCONSOLE		# fast rasterop console
-#options 	FONT_GALLANT12x22	# the console font
-#options 	FONT_BOLD8x16		# a somewhat smaller font
-## default console colors: black-on-white; this can be changed
-## using the following two options.
-#options 	RASTERCONSOLE_FGCOL=WSCOL_BLACK
-#options 	RASTERCONSOLE_BGCOL=WSCOL_WHITE
+# builtin terminal emulations
+options 	WSEMUL_SUN		# sun terminal emulation
+options 	WSEMUL_VT100		# VT100 / VT220 emulation
+options 	WSEMUL_DEFAULT=\vt100\
+
+# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
+options 	WSDISPLAY_COMPAT_RAWKBD
+options 	WSDISPLAY_CUSTOM_OUTPUT
+options 	WS_DEFAULT_FG=WSCOL_BLACK
+options 	WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
+options 	WS_KERNEL_FG=WSCOL_GREEN
+options 	WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+options 	WSDISPLAY_SCROLLSUPPORT
+options 	FONT_GALLANT12x22	# the console font
+
 
  System options that are the same for all ports
 
@@ -250,9 +255,14 @@
  Keyboard and mouse
 
 pckbc0	at obio0
-kbd0	at pckbc0
-ms0	at pckbc0
-
+#kbd0	at pckbc0
+#ms0	at pckbc0
+#wskbd* 		at kbd? console ?
+#wsmouse*	at ms? mux 0
+pckbd*		at pckbc?		# PC keyboard
+pms*		at pckbc?		# PS/2 mouse for wsmouse
+wskbd* 		at pckbd? console ?
+wsmouse*	at pms? mux 0
 
  Disk controllers and disks
 
@@ -316,7 +326,7 @@
 
 ## Sun tcx accelerated color framebuffer.
 tcx0		at sbus? slot ? offset ?
-
+wsdisplay0	at tcx0
 
  Other device configuration
 
@@ -334,3 +344,6 @@
 
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	ksyms			# /dev/ksyms
+
+pseudo-device	wsmux			# mouse and keyboard multiplexor
+pseudo-device	wsfont

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:06:36 UTC 2009

Modified Files:
src/sys/dev/sbus [netbsd-5]: p9100reg.h

Log Message:
Pull up following revision(s) (requested by macallan in ticket #993):
sys/dev/sbus/p9100reg.h: revision 1.5
add a bunch of register definitions


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/dev/sbus/p9100reg.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/sbus/p9100reg.h
diff -u src/sys/dev/sbus/p9100reg.h:1.4 src/sys/dev/sbus/p9100reg.h:1.4.10.1
--- src/sys/dev/sbus/p9100reg.h:1.4	Mon Apr 28 20:23:57 2008
+++ src/sys/dev/sbus/p9100reg.h	Sun Oct 18 14:06:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: p9100reg.h,v 1.4 2008/04/28 20:23:57 martin Exp $ */
+/*	$NetBSD: p9100reg.h,v 1.4.10.1 2009/10/18 14:06:36 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,7 +50,8 @@
 	#define DAC_INDX_AUTOINCR	0x01
 	
 #define DAC_VERSION	0x01
-#define DAC_POWER	0x05
+#define DAC_MISC_CLK0x02
+#define DAC_POWER_MGT	0x05
 	#define DAC_POWER_SCLK_DISABLE	0x10
 	#define DAC_POWER_DDOT_DISABLE	0x08
 	#define DAC_POWER_SYNC_DISABLE	0x04
@@ -58,7 +59,34 @@
 	#define DAC_POWER_ICLK_DISABLE	0x02
 	/* Disable internal DAC power */
 	#define DAC_POWER_IPWR_DISABLE	0x01
-
+#define DAC_OPERATION   0x06
+	#define DAC_SYNC_ON_GREEN   0x08
+#define DAC_PALETTE_CTRL 0x07
+#define DAC_PIXEL_FMT   0x0a
+#define DAC_8BIT_CTRL   0x0b
+	#define DAC8_DIRECT_COLOR   0x01
+#define DAC_16BIT_CTRL  0x0c
+	#define DAC16_INDIRECT_COLOR0x00
+	#define DAC16_DYNAMIC_COLOR 0x40
+	#define DAC16_DIRECT_COLOR  0xc0
+	#define DAC16_BYPASS_POLARITY   0x20
+	#define DAC16_BIT_FILL_LINEAR   0x04
+	#define DAC16_555   0x00
+	#define DAC16_565   0x02
+	#define DAC16_CONTIGUOUS0x01
+#define DAC_24BIT_CTRL  0x0d
+	#define DAC24_DIRECT_COLOR  0x01
+#define DAC_32BIT_CTRL  0x0e
+	#define DAC32_BYPASS_POLARITY   0x04
+	#define DAC32_INDIRECT_COLOR0x00
+	#define DAC32_DYNAMIC_COLOR 0x01
+	#define DAC32_DIRECT_COLOR  0x03
+#define DAC_VCO_DIV 0x16
+#define DAC_PLL00x20
+#define DAC_MISC_1  0x70
+#define DAC_MISC_2  0x71
+#define DAC_MISC_3  0x72
+  
 #define DAC_CURSOR_CTL	0x30
 	#define DAC_CURSOR_OFF	0x00
 	#define DAC_CURSOR_WIN	0x02
@@ -74,6 +102,51 @@
 #define DAC_PIX_PLL		0x8e
 #define DAC_CURSOR_DATA		0x100
 
+/* main registers */
+#define SYS_CONF0x0004  /* System Configuration Register */
+#define BUFFER_WRITE_1  0x0200  /* writes got o buffer 1 */
+#define BUFFER_WRITE_0  0x  /* writes go to buffer 0 */
+#define BUFFER_READ_1   0x0400  /* read from buffer 1 */
+#define BUFFER_READ_0   0x  
+#define MEM_SWAP_BITS   0x0800  /* swap bits when accessing VRAM */
+#define MEM_SWAP_BYTES  0x1000  /* swap bytes when accessing VRAM */
+#define MEM_SWAP_HWORDS 0x2000  /* swap halfwords when accessing VRAM */
+#define SHIFT_0 14  
+#define SHIFT_1 17
+#define SHIFT_2 20
+#define SHIFT_3 29
+#define PIXEL_SHIFT 26
+#define SWAP_SHIFT  11
+/* this is what the 3GX manual says */
+#define SC_8BIT 2
+#define SC_16BIT3
+#define SC_24BIT7
+#define SC_32BIT5
+
+/* video controller registers */
+#define VID_HCOUNTER0x104
+#define VID_HTOTAL  0x108
+#define VID_HSRE0x10c   /* hsync raising edge */
+#define VID_HBRE0x110   /* hblank raising edge */
+#define VID_HBFE0x114   /* hblank falling edge */
+#define VID_HCNTPRLD0x118   /* hcounter preload */
+#define VID_VCOUNTER0x11c   /* vcounter */
+#define VID_VLENGTH 0x120   /* lines, including blanks */
+#define VID_VSRE0x124   /* vsync raising edge */
+#define VID_VBRE0x128   /* vblank raising edge */
+#define VID_VBFE0x12c   /* vblank falling edge */
+#define VID_VCNTPRLD0x130   /* vcounter preload */
+#define VID_SRADDR  0x134   /* screen repaint address */
+#define VID_SRTC0x138   /* screen repaint timing control */
+#define VID_QSFCNTR 0x13c   /* QSF counter */
+
+#define VID_MEM_CONFIG  0x184   /* memory config */
+#define VID_RFPERIOD0x188   /* refresh period */
+#define VID_RFCOUNT 0x18c   /* refresh counter */
+#define VID_RLMAX   0x190   /* RAS low max */
+#define VID_RLCUR   0x194   /* RAS low current */
+#define VID_DACSYNC 0x198   /* read after last DAC access */
+
 #define ENGINE_STATUS	0x2000	/* drawing engine status register */
 	#define BLITTER_BUSY	0x8000
 	#define ENGINE_BUSY	0x4000
@@ -84,7 +157,7 @@
 /* apparently bits 2-6 control

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:32:29 UTC 2009

Modified Files:
src/sys/dev/sbus [netbsd-5]: files.sbus zx.c zxreg.h zxvar.h

Log Message:
Back out ticket 960


To generate a diff of this commit:
cvs rdiff -u -r1.31.36.1 -r1.31.36.2 src/sys/dev/sbus/files.sbus
cvs rdiff -u -r1.24.6.2 -r1.24.6.3 src/sys/dev/sbus/zx.c
cvs rdiff -u -r1.5.4.2 -r1.5.4.3 src/sys/dev/sbus/zxreg.h
cvs rdiff -u -r1.2.10.2 -r1.2.10.3 src/sys/dev/sbus/zxvar.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/sbus/files.sbus
diff -u src/sys/dev/sbus/files.sbus:1.31.36.1 src/sys/dev/sbus/files.sbus:1.31.36.2
--- src/sys/dev/sbus/files.sbus:1.31.36.1	Sun Oct 18 13:23:31 2009
+++ src/sys/dev/sbus/files.sbus	Sun Oct 18 14:32:29 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sbus,v 1.31.36.1 2009/10/18 13:23:31 bouyer Exp $
+#	$NetBSD: files.sbus,v 1.31.36.2 2009/10/18 14:32:29 bouyer Exp $
 #
 # Config file and device description for machine-independent SBUS code.
 # Included by ports that need it.
@@ -119,7 +119,7 @@
 attach	tcx at sbus
 file	dev/sbus/tcx.c			tcx needs-flag
 
-device	zx: fb, rasops32, wsemuldisplaydev, vcons
+device	zx: fb, rasops32
 attach	zx at sbus
 file	dev/sbus/zx.c			zx
 

Index: src/sys/dev/sbus/zx.c
diff -u src/sys/dev/sbus/zx.c:1.24.6.2 src/sys/dev/sbus/zx.c:1.24.6.3
--- src/sys/dev/sbus/zx.c:1.24.6.2	Sun Oct 18 13:23:31 2009
+++ src/sys/dev/sbus/zx.c	Sun Oct 18 14:32:29 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: zx.c,v 1.24.6.2 2009/10/18 13:23:31 bouyer Exp $	*/
+/*	$NetBSD: zx.c,v 1.24.6.3 2009/10/18 14:32:29 bouyer Exp $	*/
 
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.24.6.2 2009/10/18 13:23:31 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.24.6.3 2009/10/18 14:32:29 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -66,58 +66,45 @@
 #include dev/sun/fbio.h
 #include dev/sun/fbvar.h
 
-#include wsdisplay.h
-#if NWSDISPLAY  0
-#include dev/wscons/wsconsio.h
-#include dev/wsfont/wsfont.h
-#include dev/rasops/rasops.h
-#include dev/wscons/wsdisplay_vconsvar.h
-
-#include opt_wsemul.h
-#endif
-
 #include dev/sbus/zxreg.h
 #include dev/sbus/zxvar.h
 #include dev/sbus/sbusvar.h
 
 #include dev/wscons/wsconsio.h
 
-#if (NWSDISPLAY == 0)  !defined(RASTERCONSOLE)
-#error Sorry, this driver needs WSCONS or RASTERCONSOLE
-#endif
-
-#if (NWSDISPLAY  0)  defined(RASTERCONSOLE)
-#error Sorry, RASTERCONSOLE and WSCONS are mutually exclusive
+#ifndef RASTERCONSOLE
+#error Sorry, this driver needs the RASTERCONSOLE option
 #endif
 
 #define	ZX_STD_ROP	(ZX_ROP_NEW | ZX_ATTR_WE_ENABLE | \
 ZX_ATTR_OE_ENABLE | ZX_ATTR_FORCE_WID)
 
-static void	zx_attach(device_t, device_t, void *);
-static int	zx_match(device_t, struct cfdata *, void *);
+void	zx_attach(struct device *, struct device *, void *);
+int	zx_match(struct device *, struct cfdata *, void *);
 
-static void	zx_blank(device_t);
-static int	zx_cmap_put(struct zx_softc *);
-static void	zx_copyrect(struct zx_softc *, int, int, int, int, int, int);
-static int	zx_cross_loadwid(struct zx_softc *, u_int, u_int, u_int);
-static int	zx_cross_wait(struct zx_softc *);
-static void	zx_fillrect(struct zx_softc *, int, int, int, int, uint32_t, int);
-static int	zx_intr(void *);
-static void	zx_reset(struct zx_softc *);
-static void	zx_unblank(device_t);
-
-static void	zx_cursor_blank(struct zx_softc *);
-static void	zx_cursor_color(struct zx_softc *);
-static void	zx_cursor_move(struct zx_softc *);
-static void	zx_cursor_set(struct zx_softc *);
-static void	zx_cursor_unblank(struct zx_softc *);
-
-static void	zx_copycols(void *, int, int, int, int);
-static void	zx_copyrows(void *, int, int, int);
-static void	zx_do_cursor(void *, int, int, int);
-static void	zx_erasecols(void *, int, int, int, long);
-static void	zx_eraserows(void *, int, int, long);
-static void	zx_putchar(void *, int, int, u_int, long);
+void	zx_blank(struct device *);
+int	zx_cmap_put(struct zx_softc *);
+void	zx_copyrect(struct rasops_info *, int, int, int, int, int, int);
+int	zx_cross_loadwid(struct zx_softc *, u_int, u_int, u_int);
+int	zx_cross_wait(struct zx_softc *);
+void	zx_fillrect(struct rasops_info *, int, int, int, int, long, int);
+int	zx_intr(void *);
+void	zx_reset(struct zx_softc *);
+void	zx_unblank(struct device *);
+
+void	zx_cursor_blank(struct zx_softc *);
+void	zx_cursor_color(struct zx_softc *);
+void	zx_cursor_move(struct zx_softc *);
+void	zx_cursor_set(struct zx_softc *);
+void	zx_cursor_unblank(struct zx_softc *);
+
+void	zx_copycols(void *, int, int, int, int);
+void	zx_copyrows(void *, int, int, int);
+void	zx_cursor(void *, int, int, int);
+void	zx_do_cursor(struct rasops_info *);
+void	zx_erasecols(void *, int, int, int, long);
+void	zx_eraserows(void *, int, int, long);
+void	zx_putchar(void *, int, int, u_int, long);
 
 struct

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:34:58 UTC 2009

Modified Files:
src/sys/dev/sbus [netbsd-5]: p9100reg.h

Log Message:
back out ticket #993


To generate a diff of this commit:
cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/sys/dev/sbus/p9100reg.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/sbus/p9100reg.h
diff -u src/sys/dev/sbus/p9100reg.h:1.4.10.1 src/sys/dev/sbus/p9100reg.h:1.4.10.2
--- src/sys/dev/sbus/p9100reg.h:1.4.10.1	Sun Oct 18 14:06:36 2009
+++ src/sys/dev/sbus/p9100reg.h	Sun Oct 18 14:34:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: p9100reg.h,v 1.4.10.1 2009/10/18 14:06:36 bouyer Exp $ */
+/*	$NetBSD: p9100reg.h,v 1.4.10.2 2009/10/18 14:34:58 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,8 +50,7 @@
 	#define DAC_INDX_AUTOINCR	0x01
 	
 #define DAC_VERSION	0x01
-#define DAC_MISC_CLK0x02
-#define DAC_POWER_MGT	0x05
+#define DAC_POWER	0x05
 	#define DAC_POWER_SCLK_DISABLE	0x10
 	#define DAC_POWER_DDOT_DISABLE	0x08
 	#define DAC_POWER_SYNC_DISABLE	0x04
@@ -59,34 +58,7 @@
 	#define DAC_POWER_ICLK_DISABLE	0x02
 	/* Disable internal DAC power */
 	#define DAC_POWER_IPWR_DISABLE	0x01
-#define DAC_OPERATION   0x06
-	#define DAC_SYNC_ON_GREEN   0x08
-#define DAC_PALETTE_CTRL 0x07
-#define DAC_PIXEL_FMT   0x0a
-#define DAC_8BIT_CTRL   0x0b
-	#define DAC8_DIRECT_COLOR   0x01
-#define DAC_16BIT_CTRL  0x0c
-	#define DAC16_INDIRECT_COLOR0x00
-	#define DAC16_DYNAMIC_COLOR 0x40
-	#define DAC16_DIRECT_COLOR  0xc0
-	#define DAC16_BYPASS_POLARITY   0x20
-	#define DAC16_BIT_FILL_LINEAR   0x04
-	#define DAC16_555   0x00
-	#define DAC16_565   0x02
-	#define DAC16_CONTIGUOUS0x01
-#define DAC_24BIT_CTRL  0x0d
-	#define DAC24_DIRECT_COLOR  0x01
-#define DAC_32BIT_CTRL  0x0e
-	#define DAC32_BYPASS_POLARITY   0x04
-	#define DAC32_INDIRECT_COLOR0x00
-	#define DAC32_DYNAMIC_COLOR 0x01
-	#define DAC32_DIRECT_COLOR  0x03
-#define DAC_VCO_DIV 0x16
-#define DAC_PLL00x20
-#define DAC_MISC_1  0x70
-#define DAC_MISC_2  0x71
-#define DAC_MISC_3  0x72
-  
+
 #define DAC_CURSOR_CTL	0x30
 	#define DAC_CURSOR_OFF	0x00
 	#define DAC_CURSOR_WIN	0x02
@@ -102,51 +74,6 @@
 #define DAC_PIX_PLL		0x8e
 #define DAC_CURSOR_DATA		0x100
 
-/* main registers */
-#define SYS_CONF0x0004  /* System Configuration Register */
-#define BUFFER_WRITE_1  0x0200  /* writes got o buffer 1 */
-#define BUFFER_WRITE_0  0x  /* writes go to buffer 0 */
-#define BUFFER_READ_1   0x0400  /* read from buffer 1 */
-#define BUFFER_READ_0   0x  
-#define MEM_SWAP_BITS   0x0800  /* swap bits when accessing VRAM */
-#define MEM_SWAP_BYTES  0x1000  /* swap bytes when accessing VRAM */
-#define MEM_SWAP_HWORDS 0x2000  /* swap halfwords when accessing VRAM */
-#define SHIFT_0 14  
-#define SHIFT_1 17
-#define SHIFT_2 20
-#define SHIFT_3 29
-#define PIXEL_SHIFT 26
-#define SWAP_SHIFT  11
-/* this is what the 3GX manual says */
-#define SC_8BIT 2
-#define SC_16BIT3
-#define SC_24BIT7
-#define SC_32BIT5
-
-/* video controller registers */
-#define VID_HCOUNTER0x104
-#define VID_HTOTAL  0x108
-#define VID_HSRE0x10c   /* hsync raising edge */
-#define VID_HBRE0x110   /* hblank raising edge */
-#define VID_HBFE0x114   /* hblank falling edge */
-#define VID_HCNTPRLD0x118   /* hcounter preload */
-#define VID_VCOUNTER0x11c   /* vcounter */
-#define VID_VLENGTH 0x120   /* lines, including blanks */
-#define VID_VSRE0x124   /* vsync raising edge */
-#define VID_VBRE0x128   /* vblank raising edge */
-#define VID_VBFE0x12c   /* vblank falling edge */
-#define VID_VCNTPRLD0x130   /* vcounter preload */
-#define VID_SRADDR  0x134   /* screen repaint address */
-#define VID_SRTC0x138   /* screen repaint timing control */
-#define VID_QSFCNTR 0x13c   /* QSF counter */
-
-#define VID_MEM_CONFIG  0x184   /* memory config */
-#define VID_RFPERIOD0x188   /* refresh period */
-#define VID_RFCOUNT 0x18c   /* refresh counter */
-#define VID_RLMAX   0x190   /* RAS low max */
-#define VID_RLCUR   0x194   /* RAS low current */
-#define VID_DACSYNC 0x198   /* read after last DAC access */
-
 #define ENGINE_STATUS	0x2000	/* drawing engine status register */
 	#define BLITTER_BUSY	0x8000
 	#define ENGINE_BUSY	0x4000
@@ -157,7 +84,7 @@
 /* apparently bits 2-6 control how many pixels we write - n+1 */
 
 /* drawing engine registers */
-#define COORD_INDEX		0x218c
+#define

CVS commit: [netbsd-5] src/sys/arch/sparc/conf

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:36:30 UTC 2009

Modified Files:
src/sys/arch/sparc/conf [netbsd-5]: MRCOFFEE

Log Message:
Back out ticket 990


To generate a diff of this commit:
cvs rdiff -u -r1.23.20.2 -r1.23.20.3 src/sys/arch/sparc/conf/MRCOFFEE

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/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.2 src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.3
--- src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.2	Sun Oct 18 14:01:49 2009
+++ src/sys/arch/sparc/conf/MRCOFFEE	Sun Oct 18 14:36:30 2009
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.23.20.2 2009/10/18 14:01:49 bouyer Exp $
+# $NetBSD: MRCOFFEE,v 1.23.20.3 2009/10/18 14:36:30 bouyer Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		MRCOFFEE-$Revision: 1.23.20.2 $
+#ident 		MRCOFFEE-$Revision: 1.23.20.3 $
 
 maxusers	32
 
@@ -29,21 +29,16 @@
 # Blink the power LED on some machines to indicate the system load.
 #options 	BLINK
 
-# builtin terminal emulations
-options 	WSEMUL_SUN		# sun terminal emulation
-options 	WSEMUL_VT100		# VT100 / VT220 emulation
-options 	WSEMUL_DEFAULT=\vt100\
-
-# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
-options 	WSDISPLAY_COMPAT_RAWKBD
-options 	WSDISPLAY_CUSTOM_OUTPUT
-options 	WS_DEFAULT_FG=WSCOL_BLACK
-options 	WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options 	WS_KERNEL_FG=WSCOL_GREEN
-options 	WS_KERNEL_BG=WSCOL_LIGHT_WHITE
-options 	WSDISPLAY_SCROLLSUPPORT
-options 	FONT_GALLANT12x22	# the console font
-
+# XXX: uwe: TCX driver doesn't support RASTERCONSOLE, so don't bother
+## Use a faster console than the PROM's slow drawing routines.  Not needed
+## for headless (no framebuffer) machines.
+#options 	RASTERCONSOLE		# fast rasterop console
+#options 	FONT_GALLANT12x22	# the console font
+#options 	FONT_BOLD8x16		# a somewhat smaller font
+## default console colors: black-on-white; this can be changed
+## using the following two options.
+#options 	RASTERCONSOLE_FGCOL=WSCOL_BLACK
+#options 	RASTERCONSOLE_BGCOL=WSCOL_WHITE
 
  System options that are the same for all ports
 
@@ -255,14 +250,9 @@
  Keyboard and mouse
 
 pckbc0	at obio0
-#kbd0	at pckbc0
-#ms0	at pckbc0
-#wskbd* 		at kbd? console ?
-#wsmouse*	at ms? mux 0
-pckbd*		at pckbc?		# PC keyboard
-pms*		at pckbc?		# PS/2 mouse for wsmouse
-wskbd* 		at pckbd? console ?
-wsmouse*	at pms? mux 0
+kbd0	at pckbc0
+ms0	at pckbc0
+
 
  Disk controllers and disks
 
@@ -326,7 +316,7 @@
 
 ## Sun tcx accelerated color framebuffer.
 tcx0		at sbus? slot ? offset ?
-wsdisplay0	at tcx0
+
 
  Other device configuration
 
@@ -344,6 +334,3 @@
 
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	ksyms			# /dev/ksyms
-
-pseudo-device	wsmux			# mouse and keyboard multiplexor
-pseudo-device	wsfont

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:37:32 UTC 2009

Modified Files:
src/sys/dev/sun [netbsd-5]: fbio.h

Log Message:
Back out ticket 991


To generate a diff of this commit:
cvs rdiff -u -r1.8.74.1 -r1.8.74.2 src/sys/dev/sun/fbio.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/sun/fbio.h
diff -u src/sys/dev/sun/fbio.h:1.8.74.1 src/sys/dev/sun/fbio.h:1.8.74.2
--- src/sys/dev/sun/fbio.h:1.8.74.1	Sun Oct 18 14:00:07 2009
+++ src/sys/dev/sun/fbio.h	Sun Oct 18 14:37:32 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: fbio.h,v 1.8.74.1 2009/10/18 14:00:07 bouyer Exp $ */
+/*	$NetBSD: fbio.h,v 1.8.74.2 2009/10/18 14:37:32 bouyer Exp $ */
 
 /*
  * Copyright (c) 1992 Regents of the University of California.
@@ -72,10 +72,8 @@
 #define	FBTYPE_P9100		21	/* tadpole 3gx p9100 controller */
 #define FBTYPE_CREATOR		22	/* ffb creator or elite */
 #define FBTYPE_GENERIC_PCI	23	/* machfb, ofb and so on */
-#define FBTYPE_AG10E		24	/* Fujitsu AG-10e */
-#define FBTYPE_SUNTCX		25	/* Sun TCX, S24  */
 
-#define	FBTYPE_LASTPLUSONE	26	/* max number of fbs (change as add) */
+#define	FBTYPE_LASTPLUSONE	24	/* max number of fbs (change as add) */
 
 /*
  * XXX These really shouldn't be here, but this is what the pmax

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:39:38 UTC 2009

Modified Files:
src/sys/arch/sparc64/dev [netbsd-5]: ffb.c

Log Message:
back out ticket 972


To generate a diff of this commit:
cvs rdiff -u -r1.35.4.2 -r1.35.4.3 src/sys/arch/sparc64/dev/ffb.c

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

Modified files:

Index: src/sys/arch/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.35.4.2 src/sys/arch/sparc64/dev/ffb.c:1.35.4.3
--- src/sys/arch/sparc64/dev/ffb.c:1.35.4.2	Sun Oct 18 13:45:50 2009
+++ src/sys/arch/sparc64/dev/ffb.c	Sun Oct 18 14:39:37 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $	*/
+/*	$NetBSD: ffb.c,v 1.35.4.3 2009/10/18 14:39:37 bouyer Exp $	*/
 /*	$OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.35.4.3 2009/10/18 14:39:37 bouyer Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -239,12 +239,11 @@
 	sc-sc_fb.fb_device = sc-sc_dv;
 	fb_attach(sc-sc_fb, sc-sc_console);
 
-	ffb_clearscreen(sc);
-
 	if (sc-sc_console) {
 		wsdisplay_cnattach(ffb_stdscreen, ri, 0, 0, defattr);
-		vcons_replay_msgbuf(ffb_console_screen);
 	}
+
+	ffb_clearscreen(sc);
 	
 	waa.console = sc-sc_console;
 	waa.scrdata = ffb_screenlist;
@@ -434,6 +433,7 @@
 		break;
 #endif
 	}
+
 	return (-1);
 }

CVS commit: [netbsd-5] src/sys/arch/sparc

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:40:40 UTC 2009

Modified Files:
src/sys/arch/sparc/include [netbsd-5]: bus.h
src/sys/arch/sparc/sparc [netbsd-5]: machdep.c

Log Message:
Back out ticket 969


To generate a diff of this commit:
cvs rdiff -u -r1.54.10.1 -r1.54.10.2 src/sys/arch/sparc/include/bus.h
cvs rdiff -u -r1.282.4.2 -r1.282.4.3 src/sys/arch/sparc/sparc/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/sparc/include/bus.h
diff -u src/sys/arch/sparc/include/bus.h:1.54.10.1 src/sys/arch/sparc/include/bus.h:1.54.10.2
--- src/sys/arch/sparc/include/bus.h:1.54.10.1	Sun Oct 18 13:43:45 2009
+++ src/sys/arch/sparc/include/bus.h	Sun Oct 18 14:40:40 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.54.10.1 2009/10/18 13:43:45 bouyer Exp $	*/
+/*	$NetBSD: bus.h,v 1.54.10.2 2009/10/18 14:40:40 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -245,7 +245,6 @@
 void (*)(void));	/*optional fast vector*/
 
 
-
 static __inline int
 bus_space_map(t, a, s, f, hp)
 	bus_space_tag_t	t;
@@ -353,7 +352,7 @@
 #define BUS_SPACE_MAP_BUS1	0x0100	/* placeholders for bus functions... */
 #define BUS_SPACE_MAP_BUS2	0x0200
 #define BUS_SPACE_MAP_BUS3	0x0400
-#define BUS_SPACE_MAP_LARGE	0x0800	/* map outside IODEV range */
+#define BUS_SPACE_MAP_BUS4	0x0800
 
 
 /* flags for bus_space_barrier() */

Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.282.4.2 src/sys/arch/sparc/sparc/machdep.c:1.282.4.3
--- src/sys/arch/sparc/sparc/machdep.c:1.282.4.2	Sun Oct 18 13:43:45 2009
+++ src/sys/arch/sparc/sparc/machdep.c	Sun Oct 18 14:40:40 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.282.4.2 2009/10/18 13:43:45 bouyer Exp $ */
+/*	$NetBSD: machdep.c,v 1.282.4.3 2009/10/18 14:40:40 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.282.4.2 2009/10/18 13:43:45 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.282.4.3 2009/10/18 14:40:40 bouyer Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_compat_sunos.h
@@ -2127,8 +2127,8 @@
 	return (EINVAL);
 }
 
-static int
-sparc_bus_map_iodev(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
+int
+sparc_bus_map(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags,
 	  vaddr_t va, bus_space_handle_t *hp)
 {
 	vaddr_t v;
@@ -2194,44 +2194,11 @@
 	return (0);
 }
 
-static int
-sparc_bus_map_large(bus_space_tag_t t, bus_addr_t ba,
-		bus_size_t size, int flags, bus_space_handle_t *hp)
-{
-	vaddr_t v = 0;
-
-	if (uvm_map(kernel_map, v, size, NULL, 0, PAGE_SIZE,
-	UVM_MAPFLAG(UVM_PROT_RW, UVM_PROT_RW, UVM_INH_SHARE, UVM_ADV_NORMAL,
-			0)) == 0) {
-		return sparc_bus_map_iodev(t, ba, size, flags, v, hp);
-	}
-	return -1;
-}
-
-int
-sparc_bus_map(bus_space_tag_t t, bus_addr_t ba,
-		bus_size_t size, int flags, vaddr_t va,
-		bus_space_handle_t *hp)
-{
-
-	if (flags  BUS_SPACE_MAP_LARGE) {
-		return sparc_bus_map_large(t, ba, size, flags, hp);
-	} else
-		return sparc_bus_map_iodev(t, ba, size, flags, va, hp);
-		
-}
-
 int
 sparc_bus_unmap(bus_space_tag_t t, bus_space_handle_t bh, bus_size_t size)
 {
 	vaddr_t va = trunc_page((vaddr_t)bh);
 
-	/*
-	 * XXX
-	 * mappings with BUS_SPACE_MAP_LARGE need additional care here
-	 * we can just check if the VA is in the IODEV range
-	 */
-
 	pmap_kremove(va, round_page(size));
 	pmap_update(pmap_kernel());
 	return (0);

CVS commit: [netbsd-5] src/sys/arch/sparc/conf

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:43:09 UTC 2009

Modified Files:
src/sys/arch/sparc/conf [netbsd-5]: INSTALL

Log Message:
Back out ticket 968


To generate a diff of this commit:
cvs rdiff -u -r1.62.4.1 -r1.62.4.2 src/sys/arch/sparc/conf/INSTALL

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/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.62.4.1 src/sys/arch/sparc/conf/INSTALL:1.62.4.2
--- src/sys/arch/sparc/conf/INSTALL:1.62.4.1	Sun Oct 18 13:35:29 2009
+++ src/sys/arch/sparc/conf/INSTALL	Sun Oct 18 14:43:09 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.62.4.1 2009/10/18 13:35:29 bouyer Exp $
+#	$NetBSD: INSTALL,v 1.62.4.2 2009/10/18 14:43:09 bouyer Exp $
 #
 # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 #
@@ -47,16 +47,6 @@
 #options 	RASTERCONSOLE_FGCOL=WSCOL_BLACK
 #options 	RASTERCONSOLE_BGCOL=WSCOL_WHITE
 
-# wscons stuff
-options		WSEMUL_SUN
-#options		WSEMUL_VT100
-options		WSDISPLAY_COMPAT_RAWKBD
-options		WSDISPLAY_CUSTOM_OUTPUT
-options		WS_DEFAULT_FG=WSCOL_BLACK
-options		WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options		WS_KERNEL_FG=WSCOL_GREEN
-options		WS_KERNEL_BG=WSCOL_LIGHT_WHITE
-
  System options that are the same for all ports
 
 ## Root device configuration: change the ?'s if you are going to use a
@@ -280,21 +270,20 @@
 zs0	at obio0	# sun4m
 zs0	at obio0 addr 0xf100 level 12 flags 0x103	# sun4/200 and sun4/300
 zs0	at obio0 addr 0x0100 level 12 flags 0x103	# sun4/100
+zstty0	at zs0 channel 0	# ttya
+zstty1	at zs0 channel 1	# ttyb
 
 zs1	at mainbus0	# sun4c
 zs1	at obio0	# sun4m
 zs1	at obio0 addr 0xf000 level 12 flags 0x103	# sun4/200 and sun4/300
 zs1	at obio0 addr 0x level 12 flags 0x103	# sun4/100
+kbd0	at zs1 channel 0	# keyboard
+ms0	at zs1 channel 1	# mouse
 
-zs2	at obio0 addr 0xe000 level 12		# sun4/300
-
-zstty*	at zs?
+zs2	at obio0 addr 0xe000 level 12 flags 0x103	# sun4/300
+zstty2	at zs2 channel 0	# ttyc
+zstty3	at zs2 channel 1	# ttyd
 
-# these are for wscons
-kbd0	at zstty?
-ms0	at zstty?
-wskbd*	at wskbddev?
-wsmouse* 	at wsmousedev?
 
 ## Magma Serial/Parallel driver
 #magma*	at sbus? slot ? offset ?
@@ -556,28 +545,12 @@
 #cgeight0	at obio0 addr 0x0b30 level 4	# sun4/100 P4
 
 ## Sun tcx accelerated color framebuffer.
-#tcx0		at sbus? slot ? offset ?
-#tcx*		at sbus? slot ? offset ?
+tcx0		at sbus? slot ? offset ?
+tcx*		at sbus? slot ? offset ?
 
 # Sun cgfourteen accelerated 24-bit framebuffer.
-cgfourteen*	at obio0			# sun4m
-
-# P9100-based display on Tadpole SPARCbook 3.
-pnozz0		at sbus? slot ? offset ?
-
-# Sun ZX/Leo 24-bit framebuffer
-# XXX no wsdisplay support
-#zx*		at sbus? slot ? offset ?
+cgfourteen0	at obio0			# sun4m
 
-# Fujitsu AG-10e accelerated graphics 8/24-bit board
-agten*	at sbus? slot ? offset ?
-
-# generic framebuffer console
-genfb*	at sbus? slot ? offset ?
-
-# make sure wsdisplay0 is the console
-wsdisplay0	at wsemuldisplaydev? console 1
-wsdisplay*	at wsemuldisplaydev?
 
  Other device configuration
 
@@ -590,6 +563,3 @@
 
 pseudo-device	rnd
 #pseudo-device	fss		4	# file system snapshot device
-
-pseudo-device	wsmux			# mouse and keyboard multiplexor
-pseudo-device	wsfont

CVS commit: [netbsd-5] src/sys/arch/sparc64/include

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:44:12 UTC 2009

Modified Files:
src/sys/arch/sparc64/include [netbsd-5]: bus.h

Log Message:
Back out ticket 967


To generate a diff of this commit:
cvs rdiff -u -r1.58.10.1 -r1.58.10.2 src/sys/arch/sparc64/include/bus.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/sparc64/include/bus.h
diff -u src/sys/arch/sparc64/include/bus.h:1.58.10.1 src/sys/arch/sparc64/include/bus.h:1.58.10.2
--- src/sys/arch/sparc64/include/bus.h:1.58.10.1	Sun Oct 18 13:34:49 2009
+++ src/sys/arch/sparc64/include/bus.h	Sun Oct 18 14:44:12 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.58.10.1 2009/10/18 13:34:49 bouyer Exp $	*/
+/*	$NetBSD: bus.h,v 1.58.10.2 2009/10/18 14:44:12 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -307,8 +307,7 @@
 #define	BUS_SPACE_MAP_BUS2		0x0200
 #define	BUS_SPACE_MAP_BUS3		0x0400
 #define	BUS_SPACE_MAP_BUS4		0x0800
-/* sparc uses this, it's not supposed to do anything on sparc64 */
-#define BUS_SPACE_MAP_LARGE		0
+
 
 /* flags for bus_space_barrier() */
 #define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */

CVS commit: [netbsd-5] src/sys/arch/sparc/conf

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:45:54 UTC 2009

Modified Files:
src/sys/arch/sparc/conf [netbsd-5]: GENERIC

Log Message:
Back out 965


To generate a diff of this commit:
cvs rdiff -u -r1.205.4.2 -r1.205.4.3 src/sys/arch/sparc/conf/GENERIC

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

Modified files:

Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.205.4.2 src/sys/arch/sparc/conf/GENERIC:1.205.4.3
--- src/sys/arch/sparc/conf/GENERIC:1.205.4.2	Sun Oct 18 13:33:29 2009
+++ src/sys/arch/sparc/conf/GENERIC	Sun Oct 18 14:45:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.205.4.2 2009/10/18 13:33:29 bouyer Exp $
+# $NetBSD: GENERIC,v 1.205.4.3 2009/10/18 14:45:54 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.205.4.2 $
+#ident 		GENERIC-$Revision: 1.205.4.3 $
 
 maxusers	32
 
@@ -45,29 +45,13 @@
 
 ## Use a faster console than the PROM's slow drawing routines.  Not needed
 ## for headless (no framebuffer) machines.
-## These is obsolete for wscons kernels
-#options 	RASTERCONSOLE		# fast rasterop console
-#options 	RASTERCONSOLE_FGCOL=WSCOL_BLACK
-#options 	RASTERCONSOLE_BGCOL=WSCOL_WHITE
-
-# wscons stuff
-options		WSEMUL_SUN
-#options		WSEMUL_VT100
-options		WSDISPLAY_COMPAT_RAWKBD
-options		WSDISPLAY_CUSTOM_OUTPUT
-options		WS_DEFAULT_FG=WSCOL_BLACK
-options		WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options		WS_KERNEL_FG=WSCOL_GREEN
-options		WS_KERNEL_BG=WSCOL_LIGHT_WHITE
-options		WSDISPLAY_COMPAT_PCVT
-options 	WSDISPLAY_COMPAT_SYSCONS
-options		WSDISPLAY_COMPAT_USL
-
-options		WSDISPLAY_SCROLLSUPPORT
-
-# generic options vlid for both wscons and RASTERCONSOLE
+options 	RASTERCONSOLE		# fast rasterop console
 options 	FONT_GALLANT12x22	# the console font
 #options 	FONT_BOLD8x16		# a somewhat smaller font
+## default console colors: black-on-white; this can be changed
+## using the following two options.
+#options 	RASTERCONSOLE_FGCOL=WSCOL_BLACK
+#options 	RASTERCONSOLE_BGCOL=WSCOL_WHITE
 
  System options that are the same for all ports
 
@@ -332,23 +316,16 @@
 zs0	at obio0 addr 0xf100 level 12		# sun4/200 and sun4/300
 zs0	at obio0 addr 0x0100 level 12		# sun4/100
 zs0	at bootbus0	# sun4d
+zstty0	at zs0 channel 0# ttya
+zstty1	at zs0 channel 1# ttyb
 
 zs1	at mainbus0	# sun4c
 zs1	at obio0	# sun4m
 zs1	at obio0 addr 0xf000 level 12		# sun4/200 and sun4/300
 zs1	at obio0 addr 0x level 12		# sun4/100
 zs1	at bootbus0	# sun4d
-
-# old kbd and mouse attachments
-#kbd0	at zs1 channel 0# keyboard
-#ms0	at zs1 channel 1# mouse
-zstty*	at zs?
-
-# these are for wscons
-kbd0	at zstty?
-ms0	at zstty?
-wskbd*	at wskbddev?
-wsmouse* 	at wsmousedev?
+kbd0	at zs1 channel 0# keyboard
+ms0	at zs1 channel 1# mouse
 
 zs2	at obio0 addr 0xe000 level 12		# sun4/300
 zstty2	at zs2 channel 0# ttyc
@@ -660,8 +637,7 @@
 bwtwo0		at obio0 addr 0x0b30 level 4	# sun4/100 in P4 slot
 
 ## Sun cgtwo VME color framebuffer
-# XXX no wsdisplay support
-#cgtwo0		at vme0 addr 0x40 irq ? vect 0xa8
+cgtwo0		at vme0 addr 0x40 irq ? vect 0xa8
 
 ## Sun cgthree Sbus color framebuffer
 cgthree0	at sbus? slot ? offset ?
@@ -670,9 +646,8 @@
 
 ## Sun cgfour color framebuffer with overlay plane.  See above comment
 ## regarding overlay plane.
-# XXX no wsdisplay support
-#cgfour0		at obio0 addr 0xfb30 level 4	# sun4/300 P4
-#cgfour0		at obio0 addr 0x0b30 level 4	# sun4/100 P4
+cgfour0		at obio0 addr 0xfb30 level 4	# sun4/300 P4
+cgfour0		at obio0 addr 0x0b30 level 4	# sun4/100 P4
 
 ## Sun cgsix accelerated color framebuffer.
 cgsix0		at sbus? slot ? offset ?
@@ -681,31 +656,21 @@
 cgsix0		at obio0 addr 0x0b00 level 4	# sun4/100 P4
 
 ## Sun cgeight 24-bit framebuffer
-# XXX no wsdisplay support
-#cgeight0 	at obio0 addr 0xfb30 level 4	# sun4/300 P4
-#cgeight0	at obio0 addr 0x0b30 level 4	# sun4/100 P4
+cgeight0 	at obio0 addr 0xfb30 level 4	# sun4/300 P4
+cgeight0	at obio0 addr 0x0b30 level 4	# sun4/100 P4
 
 ## Sun tcx accelerated color framebuffer.
-# XXX no wsdisplay support
-#tcx0		at sbus? slot ? offset ?
-#tcx*		at sbus? slot ? offset ?
+tcx0		at sbus? slot ? offset ?
+tcx*		at sbus? slot ? offset ?
 
 # Sun cgfourteen accelerated 24-bit framebuffer.
-cgfourteen*	at obio0			# sun4m
+cgfourteen0	at obio0			# sun4m
 
 # P9100-based display on Tadpole SPARCbook 3.
 pnozz0		at sbus? slot ? offset ?
 
 # Sun ZX/Leo 24-bit framebuffer
-# XXX no wsdisplay support
-#zx*		at sbus? slot ? offset ?
-
-# Fujitsu AG-10e accelerated graphics 8/24-bit board
-agten*	at sbus? slot ? offset ?
-
-# make sure wsdisplay0 is the console
-wsdisplay0	at wsemuldisplaydev? console 1
-wsdisplay*	at wsemuldisplaydev?
+zx*		at sbus? slot ? offset ?
 
  Other device configuration

CVS commit: [netbsd-5] src/etc/etc.sparc

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 14:47:00 UTC 2009

Modified Files:
src/etc/etc.sparc [netbsd-5]: ttys

Log Message:
Back out 961


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/etc/etc.sparc/ttys

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

Modified files:

Index: src/etc/etc.sparc/ttys
diff -u src/etc/etc.sparc/ttys:1.14.2.1 src/etc/etc.sparc/ttys:1.14.2.2
--- src/etc/etc.sparc/ttys:1.14.2.1	Sun Oct 18 13:27:34 2009
+++ src/etc/etc.sparc/ttys	Sun Oct 18 14:47:00 2009
@@ -1,16 +1,10 @@
-#	$NetBSD: ttys,v 1.14.2.1 2009/10/18 13:27:34 bouyer Exp $
+#	$NetBSD: ttys,v 1.14.2.2 2009/10/18 14:47:00 bouyer Exp $
 #
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # name	gettytype	status		comments
 #
-console	/usr/libexec/getty suncons	sun-ss5	on secure
-constty	/usr/libexec/getty suncons	sun-ss5	off secure
-ttyE0	/usr/libexec/getty suncons	sun-ss5	off secure
-ttyE1	/usr/libexec/getty suncons	sun-ss5	off secure
-ttyE2	/usr/libexec/getty suncons	sun-ss5	off secure
-ttyE3	/usr/libexec/getty suncons	sun-ss5	off secure
+console	/usr/libexec/getty suncons	sun	on secure
+constty	/usr/libexec/getty suncons	sun	off secure
 ttya	/usr/libexec/getty std.9600	unknown	off secure
 ttyb	/usr/libexec/getty std.9600	unknown	off secure
-ttyh0   /usr/libexec/getty std.9600   unknown off secure
-ttyh1   /usr/libexec/getty std.9600   unknown off secure

CVS commit: [netbsd-5] src/doc

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 16:03:45 UTC 2009

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

Log Message:
Ticket 1075


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.118 src/doc/CHANGES-5.1:1.1.2.119
--- src/doc/CHANGES-5.1:1.1.2.118	Sun Oct 18 12:46:42 2009
+++ src/doc/CHANGES-5.1	Sun Oct 18 16:03:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.118 2009/10/18 12:46:42 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.119 2009/10/18 16:03:45 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14361,3 +14361,62 @@
 	Support VOP_ABORTOP() in puffs.
 	[pooka, ticket #1100]
 
+external/bsd/pkg_install/dist/add/add.h			1.1.1.3 - 1.1.1.5
+external/bsd/pkg_install/dist/add/main.c		1.1.1.4 - 1.1.1.6
+external/bsd/pkg_install/dist/add/perform.c		1.1.1.10 - 1.1.1.12
+external/bsd/pkg_install/dist/add/pkg_add.1		1.1.1.8
+external/bsd/pkg_install/dist/admin/audit.c		1.1.1.6
+external/bsd/pkg_install/dist/admin/main.c		1.1.1.8 - 1.1.1.11
+external/bsd/pkg_install/dist/admin/pkg_admin.1		1.1.1.9
+external/bsd/pkg_install/dist/create/build.c		1.1.1.6
+external/bsd/pkg_install/dist/create/create.h		1.1.1.4
+external/bsd/pkg_install/dist/create/main.c		1.1.1.5
+external/bsd/pkg_install/dist/create/perform.c		1.1.1.4
+external/bsd/pkg_install/dist/delete/pkg_delete.1	1.1.1.5 - 1.1.1.6
+external/bsd/pkg_install/dist/delete/pkg_delete.c	1.1.1.5
+external/bsd/pkg_install/dist/info/info.h		1.1.1.4 - 1.1.1.5
+external/bsd/pkg_install/dist/info/main.c		1.1.1.6 - 1.1.1.7
+external/bsd/pkg_install/dist/info/perform.c		1.1.1.11
+external/bsd/pkg_install/dist/info/show.c		1.1.1.7
+external/bsd/pkg_install/dist/lib/config.h.in		1.1.1.4
+external/bsd/pkg_install/dist/lib/conflicts.c		1.1.1.3
+external/bsd/pkg_install/dist/lib/decompress.c		1.1.1.3
+external/bsd/pkg_install/dist/lib/fexec.c		1.1.1.3
+external/bsd/pkg_install/dist/lib/file.c		1.1.1.4 - 1.1.1.5
+external/bsd/pkg_install/dist/lib/gpgsig.c		1.1.1.2
+external/bsd/pkg_install/dist/lib/iterate.c		1.1.1.3
+external/bsd/pkg_install/dist/lib/lib.h			1.1.1.8 - 1.1.1.9
+external/bsd/pkg_install/dist/lib/license.c		1.1.1.5
+external/bsd/pkg_install/dist/lib/parse-config.c	1.1.1.5 - 1.1.1.7
+external/bsd/pkg_install/dist/lib/pkcs7.c		1.1.1.4
+external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in	1.1.1.6 - 1.1.1.8
+external/bsd/pkg_install/dist/lib/pkg_io.c		1.1.1.7
+external/bsd/pkg_install/dist/lib/pkg_signature.c	1.1.1.6
+external/bsd/pkg_install/dist/lib/pkgdb.c		1.1.1.4 - 1.1.1.5
+external/bsd/pkg_install/dist/lib/plist.c		1.1.1.5
+external/bsd/pkg_install/dist/lib/remove.c		1.1.1.2
+external/bsd/pkg_install/dist/lib/var.c			1.1.1.3
+external/bsd/pkg_install/dist/lib/version.h		1.1.1.18 - 1.1.1.21
+
+	Update to pkg_install-20091008:
+	- pkg_add: add support to check license conditions before installation
+	- pkg_delete: add -k option to skip over preserve packages.
+	- WARNS=4 clean, fix some potential uses of uninitialized variables
+	- Add a new command for pkg_admin: findbest. It takes one or more
+	  patterns and searches for the best match in PKG_PATH, just like
+	  pkg_add would.
+	  It prints the URLs of the best match for each pattern to stdout.
+	- Rewrite the config file parser to read the file only once.
+	- Fix a bug in pkg_add's -P handling. For dependencies the pkgdb path
+	  was computed incorrectly and included destdir more than once.
+	- Fix the ACTIVE_FTP option to actually set the a flag and not the
+	  old p flag.
+	- restore pkg_add -f functionality for missing dependencies (PR 42001)
+	- pkg_admin rebuild should count packages correctly (he@), also
+	  count @pkgdir   
+	- fix gpg-sign-package syntax in pkg_admin(1)
+	- change default URL for pkg-vulnerabilities to use HTTP
+	- Fix German accent
+	- Don't dereference a null pointer for pkg_admin add
+	[joerg, ticket #1075]
+

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

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 16:39:13 UTC 2009

Modified Files:
src/sys/dev/ic [netbsd-5]: wdc.c

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1074):
sys/dev/ic/wdc.c: revision 1.258
Commit patch from PR#41926. Confirmed to work by PR submitter on two
controllers as well myself and another on viaide.
Stops errors such as the following when probing SATA drives through
controllers that offer the legacy pciide interface:
viaide1 channel 0: reset failed for drive 0
OK bouyer@


To generate a diff of this commit:
cvs rdiff -u -r1.255.4.1 -r1.255.4.2 src/sys/dev/ic/wdc.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/wdc.c
diff -u src/sys/dev/ic/wdc.c:1.255.4.1 src/sys/dev/ic/wdc.c:1.255.4.2
--- src/sys/dev/ic/wdc.c:1.255.4.1	Thu Nov 20 02:45:36 2008
+++ src/sys/dev/ic/wdc.c	Sun Oct 18 16:39:13 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc.c,v 1.255.4.1 2008/11/20 02:45:36 snj Exp $ */
+/*	$NetBSD: wdc.c,v 1.255.4.2 2009/10/18 16:39:13 bouyer Exp $ */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.  All rights reserved.
@@ -63,7 +63,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wdc.c,v 1.255.4.1 2008/11/20 02:45:36 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: wdc.c,v 1.255.4.2 2009/10/18 16:39:13 bouyer Exp $);
 
 #include opt_ata.h
 
@@ -209,7 +209,7 @@
 wdc_sataprobe(struct ata_channel *chp)
 {
 	struct wdc_regs *wdr = CHAN_TO_WDC_REGS(chp);
-	uint16_t scnt, sn, cl, ch;
+	uint8_t st = 0, sc, sn, cl, ch;
 	int i, s;
 
 	/* XXX This should be done by other code. */
@@ -222,23 +222,34 @@
 	switch (sata_reset_interface(chp, wdr-sata_iot, wdr-sata_control,
 	wdr-sata_status)) {
 	case SStatus_DET_DEV:
-		bus_space_write_1(wdr-cmd_iot, wdr-cmd_iohs[wd_sdh], 0,
-		WDSD_IBM);
-		delay(10);	/* 400ns delay */
-		scnt = bus_space_read_2(wdr-cmd_iot,
+		/* wait 5s for BSY to clear */
+		for (i = 0; i  WDC_PROBE_WAIT * hz; i++) {
+			bus_space_write_1(wdr-cmd_iot,
+			wdr-cmd_iohs[wd_sdh], 0, WDSD_IBM);
+			delay(10);  /* 400ns delay */
+			st = bus_space_read_1(wdr-cmd_iot,
+			wdr-cmd_iohs[wd_status], 0);
+			if ((st  WDCS_BSY) == 0)
+break;
+			tsleep(chp, PRIBIO, sataprb, 1);
+		}
+		if (i == WDC_PROBE_WAIT * hz)
+			aprint_error_dev(chp-ch_atac-atac_dev,
+			BSY never cleared, status 0x%02x\n, st);
+		sc = bus_space_read_1(wdr-cmd_iot,
 		wdr-cmd_iohs[wd_seccnt], 0);
-		sn = bus_space_read_2(wdr-cmd_iot,
+		sn = bus_space_read_1(wdr-cmd_iot,
 		wdr-cmd_iohs[wd_sector], 0);
-		cl = bus_space_read_2(wdr-cmd_iot,
+		cl = bus_space_read_1(wdr-cmd_iot,
 		wdr-cmd_iohs[wd_cyl_lo], 0);
-		ch = bus_space_read_2(wdr-cmd_iot,
+		ch = bus_space_read_1(wdr-cmd_iot,
 		wdr-cmd_iohs[wd_cyl_hi], 0);
-		ATADEBUG_PRINT((%s: port %d: scnt=0x%x sn=0x%x 
+		ATADEBUG_PRINT((%s: port %d: sc=0x%x sn=0x%x 
 		cl=0x%x ch=0x%x\n,
 		device_xname(chp-ch_atac-atac_dev), chp-ch_channel,
-		scnt, sn, cl, ch), DEBUG_PROBE);
+		sc, sn, cl, ch), DEBUG_PROBE);
 		/*
-		 * scnt and sn are supposed to be 0x1 for ATAPI, but in some
+		 * sc and sn are supposed to be 0x1 for ATAPI, but in some
 		 * cases we get wrong values here, so ignore it.
 		 */
 		s = splbio();

CVS commit: [netbsd-5] src/sys/arch/i386/stand/boot

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 16:41:28 UTC 2009

Modified Files:
src/sys/arch/i386/stand/boot [netbsd-5]: boot2.c

Log Message:
Apply patch, requested by snj in ticket 1080:
sys/arch/i386/stand/boot/boot2.c: patch

- If the menuformat is not letter, do not allow letter keys to be
aliases for number keys.
- Don't treat timeouts or the return key as an invalid choice.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/arch/i386/stand/boot/boot2.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/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.38 src/sys/arch/i386/stand/boot/boot2.c:1.38.4.1
--- src/sys/arch/i386/stand/boot/boot2.c:1.38	Sat Oct 11 11:06:19 2008
+++ src/sys/arch/i386/stand/boot/boot2.c	Sun Oct 18 16:41:28 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot2.c,v 1.38 2008/10/11 11:06:19 joerg Exp $	*/
+/*	$NetBSD: boot2.c,v 1.38.4.1 2009/10/18 16:41:28 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -482,11 +482,15 @@
 
 static int getchoicefrominput(char *input, int def)
 {
-	int choice;
+	int choice, usedef;
+
 	choice = -1;
-	if (*input == '\0' || *input == '\r' || *input == '\n')
+	usedef = 0;
+
+	if (*input == '\0' || *input == '\r' || *input == '\n') {
 		choice = def;
-	else if (*input = 'A'  *input  bootconf.nummenu + 'A')
+		usedef = 1;
+	} else if (*input = 'A'  *input  bootconf.nummenu + 'A')
 		choice = (*input) - 'A';
 	else if (*input = 'a'  *input  bootconf.nummenu + 'a')
 		choice = (*input) - 'a';
@@ -495,6 +499,11 @@
 		if (choice  0 || choice = bootconf.nummenu)
 			choice = -1;
 	}
+
+	if (bootconf.menuformat != MENUFORMAT_LETTER 
+	!isnum(*input)  !usedef)
+		choice = -1;
+
 	return choice;
 }

CVS commit: [netbsd-5] src

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 16:50:14 UTC 2009

Modified Files:
src/distrib/sets/lists/base [netbsd-5]: mi
src/distrib/sets/lists/man [netbsd-5]: mi
src/sys/dev/pci/hdaudio [netbsd-5]: hdaudio.c hdaudio_afg.c hdaudioio.h
hdaudiovar.h
src/usr.sbin [netbsd-5]: Makefile
Added Files:
src/usr.sbin/hdaudioctl [netbsd-5]: Makefile graph.c hdaudioctl.8
hdaudioctl.c hdaudioctl.h

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1086):
usr.sbin/hdaudioctl/Makefile: revision 1.1 via patch
usr.sbin/hdaudioctl/graph.c: revision 1.1
sys/dev/pci/hdaudio/hdaudio.c: revision 1.5
distrib/sets/lists/base/mi: revision 1.833
sys/dev/pci/hdaudio/hdaudio_afg.c: revision 1.17
sys/dev/pci/hdaudio/hdaudiovar.h: revision 1.5
distrib/sets/lists/man/mi: revision 1.1164
sys/dev/pci/hdaudio/hdaudioio.h: revision 1.3
usr.sbin/hdaudioctl/hdaudioctl.c: revision 1.1
usr.sbin/hdaudioctl/hdaudioctl.h: revision 1.1
usr.sbin/hdaudioctl/hdaudioctl.8: revision 1.1, 1.2
usr.sbin/Makefile: revision 1.243
Add ioctls required by hdaudioctl. This involves some refactoring of the
hdaudio_afg ioctl code.
Add hdaudioctl(8), a tool to manipulate hdaudio(4) devices.
It offer the following subcommands:
list - shows all child codec
get - get a plist of the chosen codec's widget configuration
set - forcibly reconfigure a specified codec from a plist
graph - generate a graphviz file for the specified codec
Sort sections, fix SEE ALSO. End sentence with dot.


To generate a diff of this commit:
cvs rdiff -u -r1.780.2.14 -r1.780.2.15 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1109.2.11 -r1.1109.2.12 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/sys/dev/pci/hdaudio/hdaudio.c \
src/sys/dev/pci/hdaudio/hdaudiovar.h
cvs rdiff -u -r1.14.2.4 -r1.14.2.5 src/sys/dev/pci/hdaudio/hdaudio_afg.c
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/sys/dev/pci/hdaudio/hdaudioio.h
cvs rdiff -u -r1.237.4.1 -r1.237.4.2 src/usr.sbin/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/usr.sbin/hdaudioctl/Makefile \
src/usr.sbin/hdaudioctl/graph.c src/usr.sbin/hdaudioctl/hdaudioctl.c \
src/usr.sbin/hdaudioctl/hdaudioctl.h
cvs rdiff -u -r0 -r1.2.2.2 src/usr.sbin/hdaudioctl/hdaudioctl.8

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.780.2.14 src/distrib/sets/lists/base/mi:1.780.2.15
--- src/distrib/sets/lists/base/mi:1.780.2.14	Wed Oct 14 18:10:21 2009
+++ src/distrib/sets/lists/base/mi	Sun Oct 18 16:50:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.780.2.14 2009/10/14 18:10:21 snj Exp $
+# $NetBSD: mi,v 1.780.2.15 2009/10/18 16:50:13 bouyer Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -1382,6 +1382,7 @@
 ./usr/sbin/groupdelbase-sysutil-bin
 ./usr/sbin/groupinfobase-sysutil-bin
 ./usr/sbin/groupmodbase-sysutil-bin
+./usr/sbin/hdaudioctlbase-sysutil-bin
 ./usr/sbin/hlfsdbase-amd-bin
 ./usr/sbin/host	base-obsolete		obsolete
 ./usr/sbin/hostapdbase-sysutil-bin

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1109.2.11 src/distrib/sets/lists/man/mi:1.1109.2.12
--- src/distrib/sets/lists/man/mi:1.1109.2.11	Fri Oct 16 11:56:10 2009
+++ src/distrib/sets/lists/man/mi	Sun Oct 18 16:50:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1109.2.11 2009/10/16 11:56:10 sborrill Exp $
+# $NetBSD: mi,v 1.1109.2.12 2009/10/18 16:50:13 bouyer Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -2088,6 +2088,7 @@
 ./usr/share/man/cat8/groupmod.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/gspa.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/halt.0			man-sysutil-catman	.cat
+./usr/share/man/cat8/hdaudioctl.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/hlfsd.0			man-amd-catman		.cat
 ./usr/share/man/cat8/hostapd.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/hostapd_cli.0		man-sysutil-catman	.cat
@@ -4471,6 +4472,7 @@
 ./usr/share/man/html8/groupmod.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/gspa.html			man-sysutil-htmlman	html
 ./usr/share/man/html8/halt.html			man-sysutil-htmlman	html
+./usr/share/man/html8/hdaudioctl.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/hlfsd.html		man-amd-htmlman		html
 ./usr/share/man/html8/hostapd.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/hostapd_cli.html		man-sysutil-htmlman	html
@@ -6951,6 +6953,7 @@
 ./usr/share/man/man8/groupmod.8			man-sysutil-man		.man
 ./usr/share/man/man8/gspa.8			man-sysutil-man		.man
 ./usr/share/man/man8/halt.8			man-sysutil-man		.man
+./usr/share/man/man8/hdaudioctl.8		man-sysutil-man		.man
 ./usr/share/man/man8/hlfsd.8

CVS commit: [netbsd-5] src/doc

2009-10-18 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Sun Oct 18 17:07:31 UTC 2009

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

Log Message:
Tickets 1075, 1080, 1086


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.119 -r1.1.2.120 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.119 src/doc/CHANGES-5.1:1.1.2.120
--- src/doc/CHANGES-5.1:1.1.2.119	Sun Oct 18 16:03:45 2009
+++ src/doc/CHANGES-5.1	Sun Oct 18 17:07:30 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.119 2009/10/18 16:03:45 bouyer Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.120 2009/10/18 17:07:30 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14420,3 +14420,35 @@
 	- Don't dereference a null pointer for pkg_admin add
 	[joerg, ticket #1075]
 
+sys/dev/ic/wdc.c1.258
+
+	Commit patch from PR#41926: use 8bits access to legacy IDE registers
+	through the SATA interface (except data registers).
+	Stops errors such as the following when probing SATA drives through
+	controllers that offer the legacy pciide interface:
+	viaide1 channel 0: reset failed for drive 0
+	[sborrill, ticket #1074]
+
+sys/arch/i386/stand/boot/boot2.c		patch
+
+	- If the menuformat is not letter, do not allow letter keys to be
+	aliases for number keys.
+	- Don't treat timeouts or the return key as an invalid choice.
+	[snj, ticket #1080]
+
+distrib/sets/lists/base/mi			1.833
+distrib/sets/lists/man/mi			1.1164
+sys/dev/pci/hdaudio/hdaudio.c			1.5
+sys/dev/pci/hdaudio/hdaudio_afg.c		1.17
+sys/dev/pci/hdaudio/hdaudioio.h			1.3
+sys/dev/pci/hdaudio/hdaudiovar.h		1.5
+usr.sbin/Makefile1.243 via patch
+usr.sbin/hdaudioctl/Makefile			1.1
+usr.sbin/hdaudioctl/graph.c			1.1
+usr.sbin/hdaudioctl/hdaudioctl.8		1.1, 1.2
+usr.sbin/hdaudioctl/hdaudioctl.c		1.1
+usr.sbin/hdaudioctl/hdaudioctl.h		1.1
+
+	Add hdaudioctl(8), a tool to manipulate hdaudio(4) devices.
+	[sborrill, ticket #1086]
+

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

2009-10-18 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Oct 18 18:24:31 UTC 2009

Modified Files:
src/sys/dev/pci [netbsd-5]: Makefile
Added Files:
src/sys/dev/pci/hdaudio [netbsd-5]: Makefile

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1101):
sys/dev/pci/Makefile: revision 1.13
sys/dev/pci/hdaudio/Makefile: revision 1.1
Install hdaudio includes required by userland tools


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.70.1 src/sys/dev/pci/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/pci/hdaudio/Makefile

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/Makefile
diff -u src/sys/dev/pci/Makefile:1.12 src/sys/dev/pci/Makefile:1.12.70.1
--- src/sys/dev/pci/Makefile:1.12	Sun Jul 23 12:01:26 2006
+++ src/sys/dev/pci/Makefile	Sun Oct 18 18:24:31 2009
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.12 2006/07/23 12:01:26 bouyer Exp $
+#	$NetBSD: Makefile,v 1.12.70.1 2009/10/18 18:24:31 snj Exp $
 
 # use 'make -f Makefile.pcidevs' to make pcidevs.h and pcidevs_data.h
 
+SUBDIR=	hdaudio
+
 INCSDIR= /usr/include/dev/pci
 
 # Only install includes which are used by userland

Added files:

Index: src/sys/dev/pci/hdaudio/Makefile
diff -u /dev/null src/sys/dev/pci/hdaudio/Makefile:1.1.2.2
--- /dev/null	Sun Oct 18 18:24:31 2009
+++ src/sys/dev/pci/hdaudio/Makefile	Sun Oct 18 18:24:31 2009
@@ -0,0 +1,8 @@
+#	$NetBSD: Makefile,v 1.1.2.2 2009/10/18 18:24:31 snj Exp $
+
+INCSDIR= /usr/include/dev/pci/hdaudio
+
+# Only install includes which are used by userland
+INCS=	hdaudioio.h hdaudioreg.h
+
+.include bsd.kinc.mk

CVS commit: [netbsd-5] src/distrib/sets/lists/comp

2009-10-18 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Oct 18 18:26:27 UTC 2009

Modified Files:
src/distrib/sets/lists/comp [netbsd-5]: mi

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1101):
distrib/sets/lists/comp/mi: revision 1.1312
Add hdaudio headers


To generate a diff of this commit:
cvs rdiff -u -r1.1201.2.12 -r1.1201.2.13 src/distrib/sets/lists/comp/mi

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

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1201.2.12 src/distrib/sets/lists/comp/mi:1.1201.2.13
--- src/distrib/sets/lists/comp/mi:1.1201.2.12	Tue Sep 15 06:01:38 2009
+++ src/distrib/sets/lists/comp/mi	Sun Oct 18 18:26:26 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1201.2.12 2009/09/15 06:01:38 snj Exp $
+#	$NetBSD: mi,v 1.1201.2.13 2009/10/18 18:26:26 snj Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -462,6 +462,8 @@
 ./usr/include/dev/ofw/openfirmio.h		comp-c-include
 ./usr/include/dev/pci/amrio.h			comp-c-include
 ./usr/include/dev/pci/amrreg.h			comp-c-include
+./usr/include/dev/pci/hdaudio/hdaudioio.h	comp-c-include
+./usr/include/dev/pci/hdaudio/hdaudioreg.h	comp-c-include
 ./usr/include/dev/pci/if_devar.h		comp-obsolete		obsolete
 ./usr/include/dev/pci/if_fxpreg.h		comp-obsolete		obsolete
 ./usr/include/dev/pci/if_fxpvar.h		comp-obsolete		obsolete

CVS commit: [netbsd-5] src/doc

2009-10-18 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Oct 18 18:28:58 UTC 2009

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

Log Message:
Ticket 1101.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.120 -r1.1.2.121 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.120 src/doc/CHANGES-5.1:1.1.2.121
--- src/doc/CHANGES-5.1:1.1.2.120	Sun Oct 18 17:07:30 2009
+++ src/doc/CHANGES-5.1	Sun Oct 18 18:28:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.120 2009/10/18 17:07:30 bouyer Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.121 2009/10/18 18:28:58 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14452,3 +14452,10 @@
 	Add hdaudioctl(8), a tool to manipulate hdaudio(4) devices.
 	[sborrill, ticket #1086]
 
+distrib/sets/lists/comp/mi			1.1312
+sys/dev/pci/Makefile1.13
+sys/dev/pci/hdaudio/Makefile			1.1
+
+	Install hdaudio includes required by userland tools.
+	[sborrill, ticket #1101]
+

CVS commit: [netbsd-5] src/distrib/sets/lists/base

2009-10-18 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Oct 18 19:02:34 UTC 2009

Modified Files:
src/distrib/sets/lists/base [netbsd-5]: mi

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1102):
distrib/sets/lists/base/mi: revision 1.830
add hdaudio files.


To generate a diff of this commit:
cvs rdiff -u -r1.780.2.15 -r1.780.2.16 src/distrib/sets/lists/base/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.780.2.15 src/distrib/sets/lists/base/mi:1.780.2.16
--- src/distrib/sets/lists/base/mi:1.780.2.15	Sun Oct 18 16:50:13 2009
+++ src/distrib/sets/lists/base/mi	Sun Oct 18 19:02:34 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.780.2.15 2009/10/18 16:50:13 bouyer Exp $
+# $NetBSD: mi,v 1.780.2.16 2009/10/18 19:02:34 snj Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -1082,6 +1082,7 @@
 ./usr/include/g++/tr1base-cxx-usr
 ./usr/include/gssapibase-c-usr
 ./usr/include/gssapi/rpc			base-obsolete		obsolete
+./usr/include/dev/pci/hdaudio			base-c-usr
 ./usr/include/isofsbase-c-usr
 ./usr/include/isofs/cd9660			base-c-usr
 ./usr/include/kadm5base-c-usr

CVS commit: [netbsd-5] src/doc

2009-10-18 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Oct 18 19:04:42 UTC 2009

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

Log Message:
Ticket 1102.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.121 src/doc/CHANGES-5.1:1.1.2.122
--- src/doc/CHANGES-5.1:1.1.2.121	Sun Oct 18 18:28:58 2009
+++ src/doc/CHANGES-5.1	Sun Oct 18 19:04:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.121 2009/10/18 18:28:58 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.122 2009/10/18 19:04:41 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14459,3 +14459,8 @@
 	Install hdaudio includes required by userland tools.
 	[sborrill, ticket #1101]
 
+distrib/sets/lists/base/mi			1.830
+
+	Add hdaudio directory to the base set list.
+	[sborrill, ticket #1102]
+

CVS commit: [netbsd-5] src/external/mit/xorg/server/drivers

2009-10-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 06:11:33 UTC 2009

Modified Files:
src/external/mit/xorg/server/drivers [netbsd-5]: Makefile
Added Files:
src/external/mit/xorg/server/drivers/xf86-video-sunleo [netbsd-5]:
Makefile

Log Message:
Pull up following revision(s) (requested by macallan in ticket #1052):
external/mit/xorg/server/drivers/Makefile: revision 1.32
external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile: revision 
1.1
build the sunleo driver on sparc and sparc64


To generate a diff of this commit:
cvs rdiff -u -r1.18.2.5 -r1.18.2.6 \
src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r0 -r1.1.2.2 \
src/external/mit/xorg/server/drivers/xf86-video-sunleo/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/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.18.2.5 src/external/mit/xorg/server/drivers/Makefile:1.18.2.6
--- src/external/mit/xorg/server/drivers/Makefile:1.18.2.5	Thu Sep 17 04:24:35 2009
+++ src/external/mit/xorg/server/drivers/Makefile	Fri Oct 16 06:11:33 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18.2.5 2009/09/17 04:24:35 snj Exp $
+#	$NetBSD: Makefile,v 1.18.2.6 2009/10/16 06:11:33 snj Exp $
 
 SUBDIR= \
 	xf86-input-keyboard \
@@ -40,6 +40,7 @@
 	xf86-video-radeon \
 	xf86-video-suncg6 \
 	xf86-video-sunffb \
+	xf86-video-sunleo \
 	xf86-video-wsfb
 .elif ${MACHINE} == shark
 SUBDIR+= \

Added files:

Index: src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.1.2.2
--- /dev/null	Fri Oct 16 06:11:33 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile	Fri Oct 16 06:11:33 2009
@@ -0,0 +1,14 @@
+#	$NetBSD: Makefile,v 1.1.2.2 2009/10/16 06:11:33 snj Exp $
+
+DRIVER=		xf86-video-sunleo
+DRIVER_NAME=	sunleo_drv
+
+SRCS=		leo_accel.c leo_checks.c leo_cursor.c leo_driver.c \
+		leo_frect.c leo_frectsp.c leo_fspans.c leo_fspanssp.c \
+		leo_glyph.c
+
+CPPFLAGS+=	${X11FLAGS.DRI}
+
+MAN=		sunleo.4
+
+.include ../Makefile.xf86-driver

CVS commit: [netbsd-5] src/distrib/sets/lists/xserver

2009-10-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 06:15:57 UTC 2009

Modified Files:
src/distrib/sets/lists/xserver [netbsd-5]: md.sparc64

Log Message:
Pull up following revision(s) (requested by macallan in ticket #1052):
distrib/sets/lists/xserver/md.sparc64: revision 1.40
add files for the sunleo driver


To generate a diff of this commit:
cvs rdiff -u -r1.26.2.5 -r1.26.2.6 src/distrib/sets/lists/xserver/md.sparc64

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

Modified files:

Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.26.2.5 src/distrib/sets/lists/xserver/md.sparc64:1.26.2.6
--- src/distrib/sets/lists/xserver/md.sparc64:1.26.2.5	Tue Sep 22 06:31:52 2009
+++ src/distrib/sets/lists/xserver/md.sparc64	Fri Oct 16 06:15:57 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.26.2.5 2009/09/22 06:31:52 snj Exp $	x11
+# $NetBSD: md.sparc64,v 1.26.2.6 2009/10/16 06:15:57 snj Exp $	x11
 ./usr/X11R6/bin/X	-unknown-	x11
 ./usr/X11R6/bin/XFree86	-unknown-	x11
 ./usr/X11R6/bin/Xsun	-unknown-	x11
@@ -324,6 +324,8 @@
 ./usr/X11R7/lib/modules/drivers/suncg6_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/sunffb_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/sunffb_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/sunleo_drv.so		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/sunleo_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/wsfb_drv.so		-unknown-	xorg
@@ -478,6 +480,7 @@
 ./usr/X11R7/man/cat4/radeon.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/suncg6.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/sunffb.0-unknown-	.cat,xorg
+./usr/X11R7/man/cat4/sunleo.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/void.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0-unknown-	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html-unknown-	html,xorg
@@ -497,6 +500,7 @@
 ./usr/X11R7/man/html4/radeon.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/suncg6.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/sunffb.html			-unknown-	html,xorg
+./usr/X11R7/man/html4/sunleo.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/void.html-unknown-	html,xorg
 ./usr/X11R7/man/html4/wsfb.html-unknown-	html,xorg
 ./usr/X11R7/man/man1/Xorg.1-unknown-	.man,xorg
@@ -516,5 +520,6 @@
 ./usr/X11R7/man/man4/radeon.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/suncg6.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/sunffb.4-unknown-	.man,xorg
+./usr/X11R7/man/man4/sunleo.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/void.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4-unknown-	.man,xorg

CVS commit: [netbsd-5] src/sys/arch/sparc/conf

2009-10-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 06:30:02 UTC 2009

Modified Files:
src/sys/arch/sparc/conf [netbsd-5]: GENERIC KRUPS MRCOFFEE TADPOLE3GX

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1065):
sys/arch/sparc/conf/GENERIC: revision 1.214
sys/arch/sparc/conf/KRUPS: revision 1.50
sys/arch/sparc/conf/MRCOFFEE: revision 1.28
sys/arch/sparc/conf/TADPOLE3GX: revision 1.47
Enable ddb(4) for sparc GENERIC-like kernels.
Discussed on port-sp...@.


To generate a diff of this commit:
cvs rdiff -u -r1.205 -r1.205.4.1 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.45 -r1.45.20.1 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.23 -r1.23.20.1 src/sys/arch/sparc/conf/MRCOFFEE
cvs rdiff -u -r1.42 -r1.42.30.1 src/sys/arch/sparc/conf/TADPOLE3GX

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/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.205 src/sys/arch/sparc/conf/GENERIC:1.205.4.1
--- src/sys/arch/sparc/conf/GENERIC:1.205	Sun Aug 10 15:31:22 2008
+++ src/sys/arch/sparc/conf/GENERIC	Fri Oct 16 06:30:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.205 2008/08/10 15:31:22 tls Exp $
+# $NetBSD: GENERIC,v 1.205.4.1 2009/10/16 06:30:01 snj Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.205 $
+#ident 		GENERIC-$Revision: 1.205.4.1 $
 
 maxusers	32
 
@@ -98,8 +98,8 @@
 ## The DDB in-kernel debugger runs at panic (unless DDB_ONPANIC=0), or at
 ## serial console break or keyboard reset, where the PROM would normally
 ## intercept.  DDB_HISTORY_SIZE adds up/down arrow command history.
-#options 	DDB			# kernel dynamic debugger
-#options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
+options 	DDB			# kernel dynamic debugger
+options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
 #options 	DDB_ONPANIC=1		# see also sysctl(8): `ddb.onpanic'
 
 ## You may also use gdb, on another computer connected to this machine over

Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.45 src/sys/arch/sparc/conf/KRUPS:1.45.20.1
--- src/sys/arch/sparc/conf/KRUPS:1.45	Mon Dec 31 15:32:06 2007
+++ src/sys/arch/sparc/conf/KRUPS	Fri Oct 16 06:30:01 2009
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.45 2007/12/31 15:32:06 ad Exp $
+# $NetBSD: KRUPS,v 1.45.20.1 2009/10/16 06:30:01 snj Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		KRUPS-$Revision: 1.45 $
+#ident 		KRUPS-$Revision: 1.45.20.1 $
 
 maxusers	32
 
@@ -119,8 +119,8 @@
 ## The DDB in-kernel debugger runs at panic (unless DDB_ONPANIC=0), or at
 ## serial console break or keyboard reset, where the PROM would normally
 ## intercept.  DDB_HISTORY_SIZE adds up/down arrow command history.
-#options 	DDB			# kernel dynamic debugger
-#options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
+options 	DDB			# kernel dynamic debugger
+options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
 #options 	DDB_ONPANIC=1		# see also sysctl(8): `ddb.onpanic'
 
 ## You may also use gdb, on another computer connected to this machine over

Index: src/sys/arch/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.23 src/sys/arch/sparc/conf/MRCOFFEE:1.23.20.1
--- src/sys/arch/sparc/conf/MRCOFFEE:1.23	Mon Dec 31 15:32:06 2007
+++ src/sys/arch/sparc/conf/MRCOFFEE	Fri Oct 16 06:30:02 2009
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.23 2007/12/31 15:32:06 ad Exp $
+# $NetBSD: MRCOFFEE,v 1.23.20.1 2009/10/16 06:30:02 snj Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		MRCOFFEE-$Revision: 1.23 $
+#ident 		MRCOFFEE-$Revision: 1.23.20.1 $
 
 maxusers	32
 
@@ -90,8 +90,8 @@
 ## The DDB in-kernel debugger runs at panic (unless DDB_ONPANIC=0), or at
 ## serial console break or keyboard reset, where the PROM would normally
 ## intercept.  DDB_HISTORY_SIZE adds up/down arrow command history.
-#options 	DDB			# kernel dynamic debugger
-#options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
+options 	DDB			# kernel dynamic debugger
+options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
 #options 	DDB_ONPANIC=1		# see also sysctl(8): `ddb.onpanic'
 
 ## You may also use gdb, on another computer connected to this machine over

Index: src/sys/arch/sparc/conf/TADPOLE3GX
diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.42 src/sys/arch/sparc/conf/TADPOLE3GX:1.42.30.1
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.42	Wed Oct 17 19:57:11 2007
+++ src/sys/arch/sparc/conf/TADPOLE3GX	Fri Oct 16 06:30:02 2009
@@ -1,4

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

2009-10-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 06:32:37 UTC 2009

Modified Files:
src/sys/dev/pci [netbsd-5]: pucdata.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1070):
sys/dev/pci/pucdata.c: revision 1.57
Add support for Oxford Semiconductor OXmPCI952 2 port UARTs.
Also update URL of Oxford UART chips.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.4.1 src/sys/dev/pci/pucdata.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/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.55 src/sys/dev/pci/pucdata.c:1.55.4.1
--- src/sys/dev/pci/pucdata.c:1.55	Sat Sep  6 22:36:40 2008
+++ src/sys/dev/pci/pucdata.c	Fri Oct 16 06:32:37 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pucdata.c,v 1.55 2008/09/06 22:36:40 rmind Exp $	*/
+/*	$NetBSD: pucdata.c,v 1.55.4.1 2009/10/16 06:32:37 snj Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Christopher G. Demetriou.  All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.55 2008/09/06 22:36:40 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.55.4.1 2009/10/16 06:32:37 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -894,12 +894,22 @@
 	 * Boards with an Oxford Semiconductor chip.
 	 *
 	 * Oxford Semiconductor provides documentation for their chip at:
-	 * URL:http://www.oxsemi.com/products/uarts/index.html
+	 * URL:http://www.plxtech.com/products/uart
 	 *
 	 * As sold by Kouwell URL:http://www.kouwell.com/.
 	 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
 	 */
 
+	/* Oxford Semiconductor OXmPCI952 PCI UARTs */
+	{   Oxford Semiconductor OXmPCI952 UARTs,
+	{	0x1415,	0x950a,	0,	0	},
+	{	0x,	0x,	0,	0	},
+	{
+		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10 },
+		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10 },
+	},
+	},
+
 	/* Oxford Semiconductor OX16PCI952 PCI `950 UARTs - 128 byte FIFOs */
 	{   Oxford Semiconductor OX16PCI952 UARTs,
 	{   0x1415, 0x9521, 0,	0	},

CVS commit: [netbsd-5] src/sys

2009-10-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 06:37:51 UTC 2009

Modified Files:
src/sys/kern [netbsd-5]: sys_mqueue.c
src/sys/sys [netbsd-5]: mqueue.h

Log Message:
Pull up following revision(s) (requested by rmind in ticket #1071):
sys/kern/sys_mqueue.c: revision 1.25 via patch
sys/sys/mqueue.h: revision 1.11 via patch
mq_timedsend/mq_timedreceive: timeout value is absolute, not relative.
While here, drop unecessary (since fdesc API changes) lwp_t arguments.
Bug reported by Stathis Kamperis, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.4 -r1.12.4.5 src/sys/kern/sys_mqueue.c
cvs rdiff -u -r1.4.16.1 -r1.4.16.2 src/sys/sys/mqueue.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/kern/sys_mqueue.c
diff -u src/sys/kern/sys_mqueue.c:1.12.4.4 src/sys/kern/sys_mqueue.c:1.12.4.5
--- src/sys/kern/sys_mqueue.c:1.12.4.4	Tue Jul 21 00:23:01 2009
+++ src/sys/kern/sys_mqueue.c	Fri Oct 16 06:37:51 2009
@@ -1,7 +1,7 @@
-/*	$NetBSD: sys_mqueue.c,v 1.12.4.4 2009/07/21 00:23:01 snj Exp $	*/
+/*	$NetBSD: sys_mqueue.c,v 1.12.4.5 2009/10/16 06:37:51 snj Exp $	*/
 
 /*
- * Copyright (c) 2007, 2008 Mindaugas Rasiukevicius rmind at NetBSD org
+ * Copyright (c) 2007-2009 Mindaugas Rasiukevicius rmind at NetBSD org
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_mqueue.c,v 1.12.4.4 2009/07/21 00:23:01 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_mqueue.c,v 1.12.4.5 2009/10/16 06:37:51 snj Exp $);
 
 #include sys/param.h
 #include sys/types.h
@@ -190,25 +190,26 @@
 }
 
 /*
- * Converter from struct timespec to the ticks.
+ * Calculate delta and convert from struct timespec to the ticks.
  * Used by mq_timedreceive(), mq_timedsend().
  */
 static int
-abstimeout2timo(const void *uaddr, int *timo)
+abstimeout2timo(struct timespec *ts, int *timo)
 {
-	struct timespec ts;
+	struct timespec tsd;
 	int error;
 
-	error = copyin(uaddr, ts, sizeof(struct timespec));
-	if (error)
+	getnanotime(tsd);
+	timespecsub(ts, tsd, tsd);
+	if (tsd.tv_sec  0 || (tsd.tv_sec == 0  tsd.tv_nsec = 0)) {
+		return ETIMEDOUT;
+	}
+	error = itimespecfix(tsd);
+	if (error) {
 		return error;
-
-	/*
-	 * According to POSIX, validation check is needed only in case of
-	 * blocking.  Thus, set the invalid value right now, and fail latter.
-	 */
-	error = itimespecfix(ts);
-	*timo = (error == 0) ? tstohz(ts) : -1;
+	}
+	*timo = tstohz(tsd);
+	KASSERT(*timo != 0);
 
 	return 0;
 }
@@ -469,11 +470,11 @@
 }
 
 /*
- * Primary mq_receive1() function.
+ * Primary mq_recv1() function.
  */
 static int
-mq_receive1(struct lwp *l, mqd_t mqdes, void *msg_ptr, size_t msg_len,
-unsigned *msg_prio, int t, ssize_t *mlen)
+mq_recv1(mqd_t mqdes, void *msg_ptr, size_t msg_len, u_int *msg_prio,
+struct timespec *ts, ssize_t *mlen)
 {
 	file_t *fp = NULL;
 	struct mqueue *mq;
@@ -499,12 +500,14 @@
 
 	/* Check if queue is empty */
 	while (TAILQ_EMPTY(mq-mq_head)) {
+		int t;
+
 		if (mq-mq_attrib.mq_flags  O_NONBLOCK) {
 			error = EAGAIN;
 			goto error;
 		}
-		if (t  0) {
-			error = EINVAL;
+		error = abstimeout2timo(ts, t);
+		if (error) {
 			goto error;
 		}
 		/*
@@ -561,11 +564,11 @@
 		syscallarg(size_t) msg_len;
 		syscallarg(unsigned *) msg_prio;
 	} */
-	int error;
 	ssize_t mlen;
+	int error;
 
-	error = mq_receive1(l, SCARG(uap, mqdes), SCARG(uap, msg_ptr),
-	SCARG(uap, msg_len), SCARG(uap, msg_prio), 0, mlen);
+	error = mq_recv1(SCARG(uap, mqdes), SCARG(uap, msg_ptr),
+	SCARG(uap, msg_len), SCARG(uap, msg_prio), NULL, mlen);
 	if (error == 0)
 		*retval = mlen;
 
@@ -583,19 +586,22 @@
 		syscallarg(unsigned *) msg_prio;
 		syscallarg(const struct timespec *) abs_timeout;
 	} */
-	int error, t;
+	struct timespec ts, *tsp;
 	ssize_t mlen;
+	int error;
 
 	/* Get and convert time value */
 	if (SCARG(uap, abs_timeout)) {
-		error = abstimeout2timo(SCARG(uap, abs_timeout), t);
+		error = copyin(SCARG(uap, abs_timeout), ts, sizeof(ts));
 		if (error)
 			return error;
-	} else
-		t = 0;
+		tsp = ts;
+	} else {
+		tsp = NULL;
+	}
 
-	error = mq_receive1(l, SCARG(uap, mqdes), SCARG(uap, msg_ptr),
-	SCARG(uap, msg_len), SCARG(uap, msg_prio), t, mlen);
+	error = mq_recv1(SCARG(uap, mqdes), SCARG(uap, msg_ptr),
+	SCARG(uap, msg_len), SCARG(uap, msg_prio), tsp, mlen);
 	if (error == 0)
 		*retval = mlen;
 
@@ -606,8 +612,8 @@
  * Primary mq_send1() function.
  */
 static int
-mq_send1(struct lwp *l, mqd_t mqdes, const char *msg_ptr, size_t msg_len,
-unsigned msg_prio, int t)
+mq_send1(mqd_t mqdes, const char *msg_ptr, size_t msg_len, u_int msg_prio,
+struct timespec *ts)
 {
 	file_t *fp = NULL;
 	struct mqueue *mq;
@@ -660,12 +666,14 @@
 
 	/* Check if queue is full */
 	while (mq-mq_attrib.mq_curmsgs = mq-mq_attrib.mq_maxmsg) {
+		int t;
+
 		if

CVS commit: [netbsd-5] src/sys/arch/alpha/alpha

2009-10-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 06:42:53 UTC 2009

Modified Files:
src/sys/arch/alpha/alpha [netbsd-5]: pmap.c

Log Message:
Pull up following revision(s) (requested by mhitch in ticket #1073):
sys/arch/alpha/alpha/pmap.c: revision 1.243
IPI interrupts occur above IPL_VM, so using IPL_VM in for the tlb shootdown
queue mutex doesn't work very well.  I get various deadlocks and corrupted
queue entries.  Change to IPL_SCHED [IPL_CLOCK] to block IPI interrupts
while the cpu is mucking with the shootdown queue.


To generate a diff of this commit:
cvs rdiff -u -r1.236.10.2 -r1.236.10.3 src/sys/arch/alpha/alpha/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/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.236.10.2 src/sys/arch/alpha/alpha/pmap.c:1.236.10.3
--- src/sys/arch/alpha/alpha/pmap.c:1.236.10.2	Wed Sep 16 04:41:13 2009
+++ src/sys/arch/alpha/alpha/pmap.c	Fri Oct 16 06:42:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.236.10.2 2009/09/16 04:41:13 snj Exp $ */
+/* $NetBSD: pmap.c,v 1.236.10.3 2009/10/16 06:42:53 snj Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.236.10.2 2009/09/16 04:41:13 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.236.10.3 2009/10/16 06:42:53 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -963,7 +963,7 @@
 	for (i = 0; i  ALPHA_MAXPROCS; i++) {
 		TAILQ_INIT(pmap_tlb_shootdown_q[i].pq_head);
 		mutex_init(pmap_tlb_shootdown_q[i].pq_lock, MUTEX_DEFAULT,
-		IPL_VM);
+		IPL_SCHED);
 	}
 #endif

CVS commit: [netbsd-5] src/sys/arch/xen/xen

2009-10-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 07:04:37 UTC 2009

Modified Files:
src/sys/arch/xen/xen [netbsd-5]: xbdback_xenbus.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1093):
sys/arch/xen/xen/xbdback_xenbus.c: revision 1.26
Don't pass a NULL arg to DIOCCACHESYNC, sd(4) dereferences it.
Pass a pointer to a int initialized to 1, so that a DIOCCACHESYNC will be
forced on sd(4).
Should fix dom0 panic reported by Sarton O'Brien.


To generate a diff of this commit:
cvs rdiff -u -r1.20.4.1 -r1.20.4.2 src/sys/arch/xen/xen/xbdback_xenbus.c

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

Modified files:

Index: src/sys/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.20.4.1 src/sys/arch/xen/xen/xbdback_xenbus.c:1.20.4.2
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.20.4.1	Mon Sep 28 01:25:22 2009
+++ src/sys/arch/xen/xen/xbdback_xenbus.c	Fri Oct 16 07:04:37 2009
@@ -1,4 +1,4 @@
-/*  $NetBSD: xbdback_xenbus.c,v 1.20.4.1 2009/09/28 01:25:22 snj Exp $  */
+/*  $NetBSD: xbdback_xenbus.c,v 1.20.4.2 2009/10/16 07:04:37 snj Exp $  */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.20.4.1 2009/09/28 01:25:22 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.20.4.2 2009/10/16 07:04:37 snj Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -1313,9 +1313,10 @@
 
 	if (xbd_io-xio_operation == BLKIF_OP_FLUSH_DISKCACHE) {
 		int error;
+		int force = 1;
 		struct xbdback_instance *xbdi = xbd_io-xio_xbdi;
 
-		error = VOP_IOCTL(xbdi-xbdi_vp, DIOCCACHESYNC, NULL, FWRITE,
+		error = VOP_IOCTL(xbdi-xbdi_vp, DIOCCACHESYNC, force, FWRITE,
 		kauth_cred_get());
 		if (error) {
 			aprint_error(xbdback %s: DIOCCACHESYNC returned %d\n,

CVS commit: [netbsd-5] src/doc

2009-10-16 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 07:09:33 UTC 2009

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

Log Message:
Tickets 1038, 1052, 1060, 1065, 1070, 1071, 1073, 1092, and 1093.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.108 -r1.1.2.109 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.108 src/doc/CHANGES-5.1:1.1.2.109
--- src/doc/CHANGES-5.1:1.1.2.108	Wed Oct 14 20:42:42 2009
+++ src/doc/CHANGES-5.1	Fri Oct 16 07:09:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.108 2009/10/14 20:42:42 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.109 2009/10/16 07:09:33 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14179,3 +14179,115 @@
 	PR#36816 PR#37860 PR#39308 PR#42094
 	[dsl, ticket #1084]
 
+share/man/man4/audio.41.70 via patch
+sys/dev/audio.c	1.248
+sys/dev/audio_if.h1.66
+sys/dev/pci/hdaudio/hdaudio_afg.c		1.16
+sys/sys/audioio.h1.33
+
+	Add support for playback- or capture-only devices.
+	Fixes PR 42050.
+	[sborrill, ticket #1038]
+
+sys/ufs/ext2fs/ext2fs_vfsops.c			1.146-1.148
+
+	Pull in a fix for mount function from ffs_vfsops.c rev1.186:
+	Change ffs_mount, in MNT_UPDATE case, to check dev_t's for equality
+	instead of just vnode pointers.  Fixes erroneous does not match
+	mounted device errors from mount(8) in the presence of MFS /dev,
+	init.root, c.
+	--
+	Pull in a fix from ffs_vfsops.c rev 1.248:
+	Fix bug introduced in revision 1.174(*) where a NULL fspec with an
+	MNT_UPDATE command would always return EINVAL. This broke fsck on
+	root, where fsck'ing a dirty root would always return an error
+	causing rc to resort in a reboot.
+	--
+	Add a missed brelse(9) call after bread(9) in ext2fs_reload().
+	Addresses PR kern/28712 (ext2fs hang on mount after fsck).
+	[tsutsui, ticket #1060]
+
+distrib/sets/lists/xserver/md.sparc64		1.40
+external/mit/xorg/server/drivers/Makefile	1.32
+external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile 1.1
+xsrc/external/mit/xf86-video-crime/dist/src/crime.h	1.7
+xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c 1.11
+xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c 1.4
+xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaGC.c 1.2
+xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaalocal.h 1.4
+
+	Build the sunleo driver on sparc64.
+	--
+	xf86-video-crime: clean up debugging code. While there:
+	* use a fake framebuffer like newport does to hide software
+	  rendering artifacts
+	* only map the framebuffer when debugging, and actually unmap
+	  it too
+	--
+	xorg-server: don't fall back to software rendering when drawing
+	  into the screen pixmap this takes care of visible artifacts
+	  with non-mappable framebuffers like newport and crime
+	[macallan, ticket #1052]
+
+sys/arch/sparc/conf/GENERIC			1.214
+sys/arch/sparc/conf/KRUPS			1.50
+sys/arch/sparc/conf/MRCOFFEE			1.28
+sys/arch/sparc/conf/TADPOLE3GX			1.47
+
+	Enable ddb(4) for sparc GENERIC-like kernels.
+	[tsutsui, ticket #1065]
+
+sys/dev/pci/pucdata.c1.57
+
+	Add support for Oxford Semiconductor OXmPCI952 2 port UARTs.
+	Also update URL of Oxford UART chips.
+	[tsutsui, ticket #1070]
+
+sys/kern/sys_mqueue.c1.25 via patch
+sys/sys/mqueue.h1.11 via patch
+
+	mq_timedsend/mq_timedreceive: timeout value is absolute, not
+	relative.
+	[rmind, ticket #1071]
+
+sys/arch/alpha/alpha/pmap.c			1.243
+
+	IPI interrupts occur above IPL_VM, so using IPL_VM in for the
+	tlb shootdown queue mutex doesn't work very well. Change to
+	IPL_SCHED [IPL_CLOCK] to block IPI interrupts while the cpu is
+	mucking with the shootdown queue.
+	[mhitch, ticket #1073]
+
+xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaGC.c 1.3
+xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaalocal.h 1.5
+xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c 1.3
+xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c 1.12
+xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c 1.5, 1.6
+xsrc/external/mit/xf86-video-newport/dist/src/newport_cmap.c 1.2
+xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c 1.5
+xsrc/external/mit/xf86-video-newport/dist/src/newport_regs.c 1.2
+xsrc/external/mit/xf86-video-newport/dist/src/newport_regs.h 1.2
+
+
+	xorg-server:
+	* simplify PIXMAP_IS_SCREEN()
+	* let xf86AddBusDeviceToConfigure() accept BUS_ISA and BUS_NONE
+	--
+	xf86-video-crime:
+	* use PIXMAP_IS_SCREEN()
+	* make X -configure work
+	* remove debug spam
+	--
+	xf86-video-newport: make this work in the New Order Of Things:
+	* make Xorg -configure work again
+	* fix the DCB timing when talking to XMAP9 to the values used by
+	the kernel
+	[macallan, ticket 1092]
+
+sys/arch/xen/xen/xbdback_xenbus.c		1.26
+
+	Don't pass a NULL arg to DIOCCACHESYNC, sd(4) dereferences it.
+	Pass a pointer

CVS commit: [netbsd-5] src

2009-10-16 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Fri Oct 16 11:56:11 UTC 2009

Modified Files:
src/distrib/sets/lists/man [netbsd-5]: mi
src/share/man/man4/man4.sparc64 [netbsd-5]: Makefile
src/sys/arch/sparc64/conf [netbsd-5]: GENERIC files.sparc64
src/sys/dev [netbsd-5]: DEVNAMES
Added Files:
src/share/man/man4/man4.sparc64 [netbsd-5]: lom.4
src/sys/arch/sparc64/dev [netbsd-5]: lom.c

Log Message:
Pull up the following revisions(s) (requested by nakayama in ticket #1064):
distrib/sets/lists/man/mi:  revision 1.1161
share/man/man4/man4.sparc64/Makefile:   revision 1.5
share/man/man4/man4.sparc64/lom.4:  revision 1.1-1.2
sys/arch/sparc64/conf/GENERIC:  revision 1.111
sys/arch/sparc64/conf/files.sparc64:revision 1.121
sys/arch/sparc64/dev/lom.c: revision 1.1
sys/dev/DEVNAMES:   revision 1.252

Add a driver for LOMlite lights out management hardware monitor and watchdog
timer.


To generate a diff of this commit:
cvs rdiff -u -r1.1109.2.10 -r1.1109.2.11 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.4 -r1.4.18.1 src/share/man/man4/man4.sparc64/Makefile
cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/man4.sparc64/lom.4
cvs rdiff -u -r1.104.2.1 -r1.104.2.2 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.118 -r1.118.20.1 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/sparc64/dev/lom.c
cvs rdiff -u -r1.242.4.1 -r1.242.4.2 src/sys/dev/DEVNAMES

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

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1109.2.10 src/distrib/sets/lists/man/mi:1.1109.2.11
--- src/distrib/sets/lists/man/mi:1.1109.2.10	Thu Oct  8 09:47:08 2009
+++ src/distrib/sets/lists/man/mi	Fri Oct 16 11:56:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1109.2.10 2009/10/08 09:47:08 sborrill Exp $
+# $NetBSD: mi,v 1.1109.2.11 2009/10/16 11:56:10 sborrill Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -1438,6 +1438,7 @@
 ./usr/share/man/cat4/sparc64/envctrl.0		man-sys-catman		.cat
 ./usr/share/man/cat4/sparc64/fdc.0		man-sys-catman		.cat
 ./usr/share/man/cat4/sparc64/intro.0		man-sys-catman		.cat
+./usr/share/man/cat4/sparc64/lom.0		man-sys-catman		.cat
 ./usr/share/man/cat4/sparc64/sab.0		man-sys-catman		.cat
 ./usr/share/man/cat4/sparc64/sabtty.0		man-sys-catman		.cat
 ./usr/share/man/cat4/spc.0			man-sys-catman		.cat
@@ -3911,6 +3912,7 @@
 ./usr/share/man/html4/sparc64/envctrl.html	man-sys-htmlman		html
 ./usr/share/man/html4/sparc64/fdc.html		man-sys-htmlman		html
 ./usr/share/man/html4/sparc64/intro.html	man-sys-htmlman		html
+./usr/share/man/html4/sparc64/lom.html		man-sys-htmlman		html
 ./usr/share/man/html4/sparc64/sab.html		man-sys-htmlman		html
 ./usr/share/man/html4/sparc64/sabtty.html	man-sys-htmlman		html
 ./usr/share/man/html4/spc.html			man-sys-htmlman		html
@@ -6300,6 +6302,7 @@
 ./usr/share/man/man4/sparc64/envctrl.4		man-sys-man		.man
 ./usr/share/man/man4/sparc64/fdc.4		man-sys-man		.man
 ./usr/share/man/man4/sparc64/intro.4		man-sys-man		.man
+./usr/share/man/man4/sparc64/lom.4		man-sys-man		.man
 ./usr/share/man/man4/sparc64/sab.4		man-sys-man		.man
 ./usr/share/man/man4/sparc64/sabtty.4		man-sys-man		.man
 ./usr/share/man/man4/spc.4			man-sys-man		.man

Index: src/share/man/man4/man4.sparc64/Makefile
diff -u src/share/man/man4/man4.sparc64/Makefile:1.4 src/share/man/man4/man4.sparc64/Makefile:1.4.18.1
--- src/share/man/man4/man4.sparc64/Makefile:1.4	Tue May  8 19:23:18 2007
+++ src/share/man/man4/man4.sparc64/Makefile	Fri Oct 16 11:56:10 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/05/08 19:23:18 jnemeth Exp $
+# $NetBSD: Makefile,v 1.4.18.1 2009/10/16 11:56:10 sborrill Exp $
 
 MANSUBDIR=/sparc64
 
-MAN=	envctrl.4 fdc.4 intro.4 sab.4
+MAN=	envctrl.4 fdc.4 intro.4 lom.4 sab.4
 
 MLINKS+=	sab.4 sabtty.4
 

Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.104.2.1 src/sys/arch/sparc64/conf/GENERIC:1.104.2.2
--- src/sys/arch/sparc64/conf/GENERIC:1.104.2.1	Thu Feb 19 20:23:46 2009
+++ src/sys/arch/sparc64/conf/GENERIC	Fri Oct 16 11:56:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.104.2.1 2009/02/19 20:23:46 snj Exp $
+# $NetBSD: GENERIC,v 1.104.2.2 2009/10/16 11:56:10 sborrill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.104.2.1 $
+#ident 		GENERIC-$Revision: 1.104.2.2 $
 
 maxusers	64
 
@@ -887,6 +887,7 @@
 
 psm*		at ebus?		# Ultrabook IIi microcontroller
 envctrl*	at ebus?		# Ultra E450 environmental monitoring
+lom*		at ebus?		# LOMlite lights out management
 
 # Netra X1 / T1 style environmental monitoring
 alipm*		at pci?

Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u

CVS commit: [netbsd-5] src/doc

2009-10-16 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Fri Oct 16 11:57:48 UTC 2009

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

Log Message:
Ticket 1064


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.109 -r1.1.2.110 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.109 src/doc/CHANGES-5.1:1.1.2.110
--- src/doc/CHANGES-5.1:1.1.2.109	Fri Oct 16 07:09:33 2009
+++ src/doc/CHANGES-5.1	Fri Oct 16 11:57:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.109 2009/10/16 07:09:33 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.110 2009/10/16 11:57:47 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14291,3 +14291,15 @@
 	will be forced on sd(4).
 	[bouyer, ticket #1093]
 
+distrib/sets/lists/man/mi			1.1161
+share/man/man4/man4.sparc64/Makefile		1.5
+share/man/man4/man4.sparc64/lom.4		1.1-1.2
+sys/arch/sparc64/conf/GENERIC			1.111
+sys/arch/sparc64/conf/files.sparc64		1.121
+sys/arch/sparc64/dev/lom.c			1.1
+sys/dev/DEVNAMES1.252
+
+	Add a driver for LOMlite lights out management hardware monitor
+	and watchdog timer.
+	[nakayama, ticket #1064]
+

CVS commit: [netbsd-5] src/lib/libpuffs

2009-10-16 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Fri Oct 16 12:07:23 UTC 2009

Modified Files:
src/lib/libpuffs [netbsd-5]: puffs.3 puffs.c puffs.h

Log Message:
Pull up the following revisions(s) (requested by pooka in ticket #1094):
lib/libpuffs/puffs.3:   revision 1.45
lib/libpuffs/puffs.c:   revision 1.93
lib/libpuffs/puffs.h:   revision 1.109

Add function puffs_setspecific(pu, private) which can be used to set the
specific data after the call to puffs_init().


To generate a diff of this commit:
cvs rdiff -u -r1.42.4.1 -r1.42.4.2 src/lib/libpuffs/puffs.3
cvs rdiff -u -r1.92 -r1.92.4.1 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.108 -r1.108.4.1 src/lib/libpuffs/puffs.h

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

Modified files:

Index: src/lib/libpuffs/puffs.3
diff -u src/lib/libpuffs/puffs.3:1.42.4.1 src/lib/libpuffs/puffs.3:1.42.4.2
--- src/lib/libpuffs/puffs.3:1.42.4.1	Tue Feb 24 03:45:56 2009
+++ src/lib/libpuffs/puffs.3	Fri Oct 16 12:07:23 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: puffs.3,v 1.42.4.1 2009/02/24 03:45:56 snj Exp $
+.\	$NetBSD: puffs.3,v 1.42.4.2 2009/10/16 12:07:23 sborrill Exp $
 .\
 .\ Copyright (c) 2006, 2007, 2008 Antti Kantee.  All rights reserved.
 .\
@@ -62,6 +62,8 @@
 .Ft void *
 .Fn puffs_getspecific struct puffs_usermount *pu
 .Ft void
+.Fn puffs_setspecific struct puffs_usermount *pu void *private
+.Ft void
 .Fn puffs_setmaxreqlen struct puffs_usermount *pu size_t maxreqlen
 .Ft size_t
 .Fn puffs_getmaxreqlen struct puffs_usermount *pu
@@ -298,6 +300,9 @@
 .Fa private
 argument of
 .Fn puffs_init .
+.It Fn puffs_setspecific pu private
+Can be used to set the specific data after the call to
+.Fn puffs_init .
 .It Fn puffs_setmaxreqlen pu maxreqlen
 In case the file system desires a maximum buffer length different from
 the default, the amount

Index: src/lib/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.92 src/lib/libpuffs/puffs.c:1.92.4.1
--- src/lib/libpuffs/puffs.c:1.92	Tue Aug 12 19:44:39 2008
+++ src/lib/libpuffs/puffs.c	Fri Oct 16 12:07:23 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.c,v 1.92 2008/08/12 19:44:39 pooka Exp $	*/
+/*	$NetBSD: puffs.c,v 1.92.4.1 2009/10/16 12:07:23 sborrill Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #if !defined(lint)
-__RCSID($NetBSD: puffs.c,v 1.92 2008/08/12 19:44:39 pooka Exp $);
+__RCSID($NetBSD: puffs.c,v 1.92.4.1 2009/10/16 12:07:23 sborrill Exp $);
 #endif /* !lint */
 
 #include sys/param.h
@@ -268,6 +268,13 @@
 	return pu-pu_privdata;
 }
 
+void
+puffs_setspecific(struct puffs_usermount *pu, void *privdata)
+{
+
+	pu-pu_privdata = privdata;
+}
+
 size_t
 puffs_getmaxreqlen(struct puffs_usermount *pu)
 {

Index: src/lib/libpuffs/puffs.h
diff -u src/lib/libpuffs/puffs.h:1.108 src/lib/libpuffs/puffs.h:1.108.4.1
--- src/lib/libpuffs/puffs.h:1.108	Tue Aug 12 19:44:39 2008
+++ src/lib/libpuffs/puffs.h	Fri Oct 16 12:07:23 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.h,v 1.108 2008/08/12 19:44:39 pooka Exp $	*/
+/*	$NetBSD: puffs.h,v 1.108.4.1 2009/10/16 12:07:23 sborrill Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -438,6 +438,7 @@
 	  enum vtype, vsize_t, dev_t); 
 
 void			*puffs_getspecific(struct puffs_usermount *);
+void			puffs_setspecific(struct puffs_usermount *, void *);
 void			puffs_setmaxreqlen(struct puffs_usermount *, size_t);
 size_t			puffs_getmaxreqlen(struct puffs_usermount *);
 void			puffs_setfhsize(struct puffs_usermount *, size_t, int);

CVS commit: [netbsd-5] src/doc

2009-10-16 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Fri Oct 16 12:07:45 UTC 2009

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

Log Message:
Ticket 1094


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.110 -r1.1.2.111 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.110 src/doc/CHANGES-5.1:1.1.2.111
--- src/doc/CHANGES-5.1:1.1.2.110	Fri Oct 16 11:57:47 2009
+++ src/doc/CHANGES-5.1	Fri Oct 16 12:07:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.110 2009/10/16 11:57:47 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.111 2009/10/16 12:07:45 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14303,3 +14303,11 @@
 	and watchdog timer.
 	[nakayama, ticket #1064]
 
+lib/libpuffs/puffs.31.45
+lib/libpuffs/puffs.c1.93
+lib/libpuffs/puffs.h1.109
+
+	Add function puffs_setspecific(pu, private) which can be used
+	to set the specific data after the call to puffs_init().
+	[pooka, ticket #1094]
+

CVS commit: [netbsd-5] src/doc

2009-10-16 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Fri Oct 16 12:11:18 UTC 2009

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

Log Message:
Ticket 1095


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.111 -r1.1.2.112 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.111 src/doc/CHANGES-5.1:1.1.2.112
--- src/doc/CHANGES-5.1:1.1.2.111	Fri Oct 16 12:07:45 2009
+++ src/doc/CHANGES-5.1	Fri Oct 16 12:11:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.111 2009/10/16 12:07:45 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.112 2009/10/16 12:11:18 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14311,3 +14311,10 @@
 	to set the specific data after the call to puffs_init().
 	[pooka, ticket #1094]
 
+lib/libpuffs/puffs.c1.94
+lib/libpuffs/puffs.h1.110
+
+	Add puffs_cancel(), which allows to back down after
+	puffs_init() and before puffs_mount().
+	[pooka, ticket #1095]
+

CVS commit: [netbsd-5] src/doc

2009-10-16 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Fri Oct 16 14:51:33 UTC 2009

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

Log Message:
Ticket 1096


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.112 src/doc/CHANGES-5.1:1.1.2.113
--- src/doc/CHANGES-5.1:1.1.2.112	Fri Oct 16 12:11:18 2009
+++ src/doc/CHANGES-5.1	Fri Oct 16 14:51:32 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.112 2009/10/16 12:11:18 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.113 2009/10/16 14:51:32 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14318,3 +14318,11 @@
 	puffs_init() and before puffs_mount().
 	[pooka, ticket #1095]
 
+usr.sbin/user/user.c1.124
+
+	Fix -p flag. 
+	- rm_eo is the first character *after* the match, so
+	no need for a +1.
+	- Blowfish hashes are only 53 chars long, not 54.
+	[hubertf, ticket #1096
+

CVS commit: [netbsd-5] src/doc

2009-10-16 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Fri Oct 16 14:53:21 UTC 2009

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

Log Message:
Typo fix


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.113 -r1.1.2.114 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.113 src/doc/CHANGES-5.1:1.1.2.114
--- src/doc/CHANGES-5.1:1.1.2.113	Fri Oct 16 14:51:32 2009
+++ src/doc/CHANGES-5.1	Fri Oct 16 14:53:21 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.113 2009/10/16 14:51:32 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.114 2009/10/16 14:53:21 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14320,9 +14320,9 @@
 
 usr.sbin/user/user.c1.124
 
-	Fix -p flag. 
+	Fix -p flag:
 	- rm_eo is the first character *after* the match, so
 	no need for a +1.
 	- Blowfish hashes are only 53 chars long, not 54.
-	[hubertf, ticket #1096
+	[hubertf, ticket #1096]

CVS commit: [netbsd-5] src/usr.bin/pwhash

2009-10-16 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Fri Oct 16 14:56:45 UTC 2009

Modified Files:
src/usr.bin/pwhash [netbsd-5]: pwhash.1

Log Message:
Pull up the following revisions(s) (requested by hubertf in ticket #1097):
usr.bin/pwhash/pwhash.1:revision 1.6

Make the format for -k flag clearer.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.34.1 src/usr.bin/pwhash/pwhash.1

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

Modified files:

Index: src/usr.bin/pwhash/pwhash.1
diff -u src/usr.bin/pwhash/pwhash.1:1.5 src/usr.bin/pwhash/pwhash.1:1.5.34.1
--- src/usr.bin/pwhash/pwhash.1:1.5	Wed Nov 17 14:57:48 2004
+++ src/usr.bin/pwhash/pwhash.1	Fri Oct 16 14:56:45 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: pwhash.1,v 1.5 2004/11/17 14:57:48 wiz Exp $
+.\	$NetBSD: pwhash.1,v 1.5.34.1 2009/10/16 14:56:45 sborrill Exp $
 .\	$OpenBSD: encrypt.1,v 1.16 2000/11/09 17:52:07 aaron Exp $
 .\
 .\ Copyright (c) 1996, Jason Downs.  All rights reserved.
@@ -24,7 +24,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd October 12, 2004
+.Dd October 16, 2009
 .Dt PWHASH 1
 .Os
 .Sh NAME
@@ -52,8 +52,9 @@
 .It Fl k
 Run in
 .Xr makekey 8
-compatible mode; a single combined key and salt are read from standard
-input and the DES encrypted result is written to standard output without a
+compatible mode.
+A single combined key (eight chars) and salt (two chars) with no intermediate space
+are read from standard input and the DES encrypted result is written to standard output without a
 terminating newline.
 .It Fl m
 Encrypt the string using MD5.

CVS commit: [netbsd-5] src/doc

2009-10-16 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Fri Oct 16 14:57:09 UTC 2009

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

Log Message:
Ticket 1097


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.114 src/doc/CHANGES-5.1:1.1.2.115
--- src/doc/CHANGES-5.1:1.1.2.114	Fri Oct 16 14:53:21 2009
+++ src/doc/CHANGES-5.1	Fri Oct 16 14:57:09 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.114 2009/10/16 14:53:21 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.115 2009/10/16 14:57:09 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14326,3 +14326,8 @@
 	- Blowfish hashes are only 53 chars long, not 54.
 	[hubertf, ticket #1096]
 
+usr.bin/pwhash/pwhash.11.6
+
+	Make the format for -k flag clearer.
+	[hubertf, ticket #1097]
+

CVS commit: [netbsd-5] src

2009-10-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 05:43:38 UTC 2009

Modified Files:
src/share/man/man4 [netbsd-5]: audio.4
src/sys/dev [netbsd-5]: audio.c audio_if.h
src/sys/dev/pci/hdaudio [netbsd-5]: hdaudio_afg.c
src/sys/sys [netbsd-5]: audioio.h

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1038):
share/man/man4/audio.4: revision 1.70 via patch
sys/dev/audio.c: revision 1.248
sys/dev/audio_if.h: revision 1.66
sys/dev/pci/hdaudio/hdaudio_afg.c: revision 1.16
sys/sys/audioio.h: revision 1.33
Add support for playback- or capture-only devices.
Fixes PR 42050


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.68.4.1 src/share/man/man4/audio.4
cvs rdiff -u -r1.243.6.2 -r1.243.6.3 src/sys/dev/audio.c
cvs rdiff -u -r1.65 -r1.65.14.1 src/sys/dev/audio_if.h
cvs rdiff -u -r1.14.2.3 -r1.14.2.4 src/sys/dev/pci/hdaudio/hdaudio_afg.c
cvs rdiff -u -r1.32 -r1.32.44.1 src/sys/sys/audioio.h

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/audio.4
diff -u src/share/man/man4/audio.4:1.68 src/share/man/man4/audio.4:1.68.4.1
--- src/share/man/man4/audio.4:1.68	Wed Apr 30 13:10:53 2008
+++ src/share/man/man4/audio.4	Fri Oct 16 05:43:37 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: audio.4,v 1.68 2008/04/30 13:10:53 martin Exp $
+.\	$NetBSD: audio.4,v 1.68.4.1 2009/10/16 05:43:37 snj Exp $
 .\
 .\ Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd June 11, 2007
+.Dd September 29, 2009
 .Dt AUDIO 4
 .Os
 .Sh NAME
@@ -243,6 +243,10 @@
 .It Dv AUDIO_PROP_INDEPENDENT
 the device can set the playing and recording encoding parameters
 independently.
+.It Dv AUDIO_PROP_PLAYBACK
+the device is capable of audio playback.
+.It Dv AUDIO_PROP_CAPTURE
+the device is capable of audio capture.
 .El
 .It Dv AUDIO_GETIOFFS (audio_offset_t)
 .It Dv AUDIO_GETOOFFS (audio_offset_t)

Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.243.6.2 src/sys/dev/audio.c:1.243.6.3
--- src/sys/dev/audio.c:1.243.6.2	Tue Sep 29 22:50:11 2009
+++ src/sys/dev/audio.c	Fri Oct 16 05:43:37 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.243.6.2 2009/09/29 22:50:11 snj Exp $	*/
+/*	$NetBSD: audio.c,v 1.243.6.3 2009/10/16 05:43:37 snj Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.243.6.2 2009/09/29 22:50:11 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.243.6.3 2009/10/16 05:43:37 snj Exp $);
 
 #include audio.h
 #if NAUDIO  0
@@ -192,6 +192,10 @@
 static void	audio_mixer_capture(struct audio_softc *);
 static void	audio_mixer_restore(struct audio_softc *);
 
+static int	audio_get_props(struct audio_softc *);
+static bool	audio_can_playback(struct audio_softc *);
+static bool	audio_can_capture(struct audio_softc *);
+
 static void	audio_softintr_rd(void *);
 static void	audio_softintr_wr(void *);
 
@@ -314,41 +318,51 @@
 	}
 #endif
 
-	props = hwp-get_props(hdlp);
+	sc-hw_if = hwp;
+	sc-hw_hdl = hdlp;
+	sc-sc_dev = parent;
+	sc-sc_opencnt = 0;
+	sc-sc_writing = sc-sc_waitcomp = 0;
+	sc-sc_lastinfovalid = false;
 
-	aprint_naive(\n);
+	props = audio_get_props(sc);
 
 	if (props  AUDIO_PROP_FULLDUPLEX)
 		aprint_normal(: full duplex);
 	else
 		aprint_normal(: half duplex);
 
+	if (props  AUDIO_PROP_PLAYBACK)
+		aprint_normal(, playback);
+	if (props  AUDIO_PROP_CAPTURE)
+		aprint_normal(, capture);
 	if (props  AUDIO_PROP_MMAP)
 		aprint_normal(, mmap);
 	if (props  AUDIO_PROP_INDEPENDENT)
 		aprint_normal(, independent);
 
+	aprint_naive(\n);
 	aprint_normal(\n);
 
-	sc-hw_if = hwp;
-	sc-hw_hdl = hdlp;
-	sc-sc_dev = parent;
-	sc-sc_opencnt = 0;
-	sc-sc_writing = sc-sc_waitcomp = 0;
-	sc-sc_lastinfovalid = false;
-
-	error = audio_alloc_ring(sc, sc-sc_pr, AUMODE_PLAY, AU_RING_SIZE);
-	if (error) {
-		sc-hw_if = NULL;
-		aprint_error(audio: could not allocate play buffer\n);
-		return;
+	if (audio_can_playback(sc)) {
+		error = audio_alloc_ring(sc, sc-sc_pr,
+		AUMODE_PLAY, AU_RING_SIZE);
+		if (error) {
+			sc-hw_if = NULL;
+			aprint_error(audio: could not allocate play buffer\n);
+			return;
+		}
 	}
-	error = audio_alloc_ring(sc, sc-sc_rr, AUMODE_RECORD, AU_RING_SIZE);
-	if (error) {
-		audio_free_ring(sc, sc-sc_pr);
-		sc-hw_if = NULL;
-		aprint_error(audio: could not allocate record buffer\n);
-		return;
+	if (audio_can_capture(sc)) {
+		error = audio_alloc_ring(sc, sc-sc_rr,
+		AUMODE_RECORD, AU_RING_SIZE);
+		if (error) {
+			if (sc-sc_pr.s.start != 0)
+audio_free_ring(sc, sc-sc_pr);
+			sc-hw_if = NULL;
+			aprint_error(audio: could not allocate record buffer\n);
+			return;
+		}
 	}
 
 	sc-sc_lastgain = 128;
@@ -741,6 +755,8 @@
 void

CVS commit: [netbsd-5] src/sys/ufs/ext2fs

2009-10-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 05:48:49 UTC 2009

Modified Files:
src/sys/ufs/ext2fs [netbsd-5]: ext2fs_vfsops.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1060):
sys/ufs/ext2fs/ext2fs_vfsops.c: revision 1.146
Pull a fix for mount function from ffs_vfsops.c rev1.186:
Change ffs_mount, in MNT_UPDATE case, to check dev_t's for equality
instead of just vnode pointers.  Fixes erroneous does not match mounted
device errors from mount(8) in the presence of MFS /dev, init.root, c.


To generate a diff of this commit:
cvs rdiff -u -r1.137.6.1 -r1.137.6.2 src/sys/ufs/ext2fs/ext2fs_vfsops.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/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.1 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.2
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.1	Sat Nov 29 23:10:19 2008
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c	Fri Oct 16 05:48:48 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vfsops.c,v 1.137.6.1 2008/11/29 23:10:19 snj Exp $	*/
+/*	$NetBSD: ext2fs_vfsops.c,v 1.137.6.2 2009/10/16 05:48:48 snj Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -65,7 +65,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.137.6.1 2008/11/29 23:10:19 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.137.6.2 2009/10/16 05:48:48 snj Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_compat_netbsd.h
@@ -362,8 +362,15 @@
 			 * used for our initial mount
 			 */
 			ump = VFSTOUFS(mp);
-			if (devvp != ump-um_devvp)
-error = EINVAL;
+			if (devvp != ump-um_devvp) {
+if (devvp-v_rdev != ump-um_devvp-v_rdev)
+	error = EINVAL;
+else {
+	vrele(devvp);
+	devvp = ump-um_devvp;
+	vref(devvp);
+}
+			}
 		}
 	} else {
 		if (!update) {

CVS commit: [netbsd-5] src/sys/ufs/ext2fs

2009-10-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 16 05:50:05 UTC 2009

Modified Files:
src/sys/ufs/ext2fs [netbsd-5]: ext2fs_vfsops.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1060):
sys/ufs/ext2fs/ext2fs_vfsops.c: revision 1.147
Pull a fix from ffs_vfsops.c rev 1.248:
Fix bug introduced in revision 1.174(*) where a NULL fspec with an MNT_UPDATE
command would always return EINVAL. This broke fsck on root, where fsck'ing
a dirty root would always return an error causing rc to resort in a reboot.
(*) This is Apply the NFS exports list rototill patch change
   in ext2fs_vfsops.c rev 1.91.


To generate a diff of this commit:
cvs rdiff -u -r1.137.6.2 -r1.137.6.3 src/sys/ufs/ext2fs/ext2fs_vfsops.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/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.2 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.3
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.2	Fri Oct 16 05:48:48 2009
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c	Fri Oct 16 05:50:05 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vfsops.c,v 1.137.6.2 2009/10/16 05:48:48 snj Exp $	*/
+/*	$NetBSD: ext2fs_vfsops.c,v 1.137.6.3 2009/10/16 05:50:05 snj Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -65,7 +65,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.137.6.2 2009/10/16 05:48:48 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.137.6.3 2009/10/16 05:50:05 snj Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_compat_netbsd.h
@@ -475,7 +475,7 @@
 			fs-e2fs_fmod = 1;
 		}
 		if (args-fspec == NULL)
-			return EINVAL;
+			return 0;
 	}
 
 	error = set_statvfs_info(path, UIO_USERSPACE, args-fspec,

CVS commit: [netbsd-5] src

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 09:13:54 UTC 2009

Modified Files:
src/include [netbsd-5]: util.h
src/lib/libutil [netbsd-5]: opendisk.c

Log Message:
Pull up the following revisions(s) (requested by pooka in ticket #1089):
include/util.h: revision 1.53
lib/libutil/opendisk.c: revision 1.12

Fix the open routine function pointer prototype of opendisk1() to match
the prototype of open().


To generate a diff of this commit:
cvs rdiff -u -r1.49.12.1 -r1.49.12.2 src/include/util.h
cvs rdiff -u -r1.10.6.1 -r1.10.6.2 src/lib/libutil/opendisk.c

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

Modified files:

Index: src/include/util.h
diff -u src/include/util.h:1.49.12.1 src/include/util.h:1.49.12.2
--- src/include/util.h:1.49.12.1	Mon Oct  5 11:46:21 2009
+++ src/include/util.h	Wed Oct 14 09:13:54 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.h,v 1.49.12.1 2009/10/05 11:46:21 sborrill Exp $	*/
+/*	$NetBSD: util.h,v 1.49.12.2 2009/10/14 09:13:54 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 1995
@@ -81,7 +81,7 @@
 void		logwtmpx(const char *, const char *, const char *, int, int);
 int		opendisk(const char *, int, char *, size_t, int);
 int		opendisk1(const char *, int, char *, size_t, int,
-			  int (*)(const char *, int, mode_t));
+			  int (*)(const char *, int, ...));
 int		openpty(int *, int *, char *, struct termios *,
 		struct winsize *);
 time_t		parsedate(const char *, const time_t *, const int *);

Index: src/lib/libutil/opendisk.c
diff -u src/lib/libutil/opendisk.c:1.10.6.1 src/lib/libutil/opendisk.c:1.10.6.2
--- src/lib/libutil/opendisk.c:1.10.6.1	Mon Oct  5 11:46:21 2009
+++ src/lib/libutil/opendisk.c	Wed Oct 14 09:13:54 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: opendisk.c,v 1.10.6.1 2009/10/05 11:46:21 sborrill Exp $	*/
+/*	$NetBSD: opendisk.c,v 1.10.6.2 2009/10/14 09:13:54 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: opendisk.c,v 1.10.6.1 2009/10/05 11:46:21 sborrill Exp $);
+__RCSID($NetBSD: opendisk.c,v 1.10.6.2 2009/10/14 09:13:54 sborrill Exp $);
 #endif
 
 #include sys/param.h
@@ -46,7 +46,7 @@
 
 static int
 __opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked,
-	int (*ofn)(const char *, int, mode_t))
+	int (*ofn)(const char *, int, ...))
 {
 	int f, rawpart;
 
@@ -92,12 +92,12 @@
 opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked)
 {
 
-	return __opendisk(path, flags, buf, buflen, iscooked, (void *)open);
+	return __opendisk(path, flags, buf, buflen, iscooked, open);
 }
 
 int
 opendisk1(const char *path, int flags, char *buf, size_t buflen, int iscooked,
-	int (*ofn)(const char *, int, mode_t))
+	int (*ofn)(const char *, int, ...))
 {
 
 	return __opendisk(path, flags, buf, buflen, iscooked, ofn);

CVS commit: [netbsd-5] src/doc

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 09:14:17 UTC 2009

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

Log Message:
Ticket 1089


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.100 -r1.1.2.101 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.100 src/doc/CHANGES-5.1:1.1.2.101
--- src/doc/CHANGES-5.1:1.1.2.100	Sun Oct 11 18:04:30 2009
+++ src/doc/CHANGES-5.1	Wed Oct 14 09:14:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.100 2009/10/11 18:04:30 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.101 2009/10/14 09:14:16 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14119,3 +14119,10 @@
 	this there is a simple local-user panic in ureadc().
 	[dsl, ticket #1087]
 
+include/util.h	1.53
+lib/libutil/opendisk.c1.12
+
+	Fix the open routine function pointer prototype of opendisk1()
+	to match the prototype of open().
+	[pooka, ticket #1089]
+

CVS commit: [netbsd-5] src/crypto/dist/heimdal/lib/krb5

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 09:17:13 UTC 2009

Modified Files:
src/crypto/dist/heimdal/lib/krb5 [netbsd-5]: krb5_get_in_cred.3

Log Message:
Pull up the following revisions(s) (requested by joerg in ticket #1090):
crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:revision 1.2

Fix man page markup.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.8.1 \
src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3

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

Modified files:

Index: src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3
diff -u src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1 src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1.8.1
--- src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1	Sat Mar 22 08:37:14 2008
+++ src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3	Wed Oct 14 09:17:13 2009
@@ -30,7 +30,7 @@
 .\ SUCH DAMAGE.
 .\
 .\ $Heimdal: krb5_get_in_cred.3 17593 2006-05-29 14:55:18Z lha $
-.\ $NetBSD: krb5_get_in_cred.3,v 1.1 2008/03/22 08:37:14 mlelstv Exp $
+.\ $NetBSD: krb5_get_in_cred.3,v 1.1.8.1 2009/10/14 09:17:13 sborrill Exp $
 .\
 .Dd May 31, 2003
 .Dt KRB5_GET_IN_TKT 3
@@ -170,7 +170,7 @@
 .Nm krb5_get_in_tkt_with_password
 uses the clients password to authenticate.
 If the password argument is
-.DV NULL
+.Dv NULL
 the user user queried with the default password query function.
 .Pp
 .Nm krb5_get_in_tkt_with_keytab

CVS commit: [netbsd-5] src/doc

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 09:18:33 UTC 2009

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

Log Message:
Pull up the following revisions(s) (requested by joerg in ticket #1090):
crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:revision 1.2

Fix man page markup.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.101 -r1.1.2.102 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.101 src/doc/CHANGES-5.1:1.1.2.102
--- src/doc/CHANGES-5.1:1.1.2.101	Wed Oct 14 09:14:16 2009
+++ src/doc/CHANGES-5.1	Wed Oct 14 09:18:32 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.101 2009/10/14 09:14:16 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.102 2009/10/14 09:18:32 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14126,3 +14126,8 @@
 	to match the prototype of open().
 	[pooka, ticket #1089]
 
+crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3	1.2
+
+	Fix man page markup.
+	[joerg, ticket #1090]
+

CVS commit: [netbsd-5] src

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 09:31:28 UTC 2009

Modified Files:
src/include [netbsd-5]: dlfcn.h
src/lib/libc/dlfcn [netbsd-5]: dlfcn_elf.c
src/libexec/ld.elf_so [netbsd-5]: reloc.c rtld.c rtld.h symbol.c

Log Message:
Pull up the following revisions(s) (requested by pooka in ticket #1088):
include/dlfcn.h:revision 1.20
lib/libc/dlfcn/dlfcn_elf.c: revision 1.6
libexec/ld.elf_so/reloc.c:  revision 1.97
libexec/ld.elf_so/rtld.c:   revision 1.125
libexec/ld.elf_so/rtld.h:   revision 1.81
libexec/ld.elf_so/symbol.c: revision 1.48

Add Solarisa-like dlinfo() interface to the ELF dynamic linker.
Implement RTLD_DI_LINKMAP which returns a pointer to the linkmap
chain at the given object.  Other Solaris queries are currently
unimplemented.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.8.1 src/include/dlfcn.h
cvs rdiff -u -r1.5 -r1.5.32.1 src/lib/libc/dlfcn/dlfcn_elf.c
cvs rdiff -u -r1.96 -r1.96.4.1 src/libexec/ld.elf_so/reloc.c
cvs rdiff -u -r1.123 -r1.123.2.1 src/libexec/ld.elf_so/rtld.c
cvs rdiff -u -r1.79 -r1.79.4.1 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.47 -r1.47.4.1 src/libexec/ld.elf_so/symbol.c

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

Modified files:

Index: src/include/dlfcn.h
diff -u src/include/dlfcn.h:1.19 src/include/dlfcn.h:1.19.8.1
--- src/include/dlfcn.h:1.19	Mon Apr 28 20:22:54 2008
+++ src/include/dlfcn.h	Wed Oct 14 09:31:28 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: dlfcn.h,v 1.19 2008/04/28 20:22:54 martin Exp $	*/
+/*	$NetBSD: dlfcn.h,v 1.19.8.1 2009/10/14 09:31:28 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -54,6 +54,7 @@
 #if defined(_NETBSD_SOURCE)
 int	dladdr(const void * __restrict, Dl_info * __restrict);
 int	dlctl(void *, int, void *);
+int	dlinfo(void *, int, void *);
 #endif
 __aconst char *dlerror(void);
 __END_DECLS
@@ -88,4 +89,23 @@
 #endif /* 0 */
 #endif /* defined(_NETBSD_SOURCE) */
 
+/*
+ * dlinfo() commands
+ *
+ * From Solarisa: http://docs.sun.com/app/docs/doc/816-5168/dlinfo-3c?a=view
+ */
+#if defined(_NETBSD_SOURCE)
+#define RTLD_DI_LINKMAP		3
+#if 0
+#define RTLD_DI_ARGSINFO	1
+#define RTLD_DI_CONFIGADDR	2
+#define RTLD_DI_LMID		4
+#define RTLD_DI_SERINFO		5
+#define RTLD_DI_SERINFOSIZE	6
+#define RTLD_DI_ORIGIN		7
+#define RTLD_DI_GETSIGNAL	8
+#define RTLD_DI_SETSIGNAL	9
+#endif
+#endif /* _NETBSD_SOURCE */
+
 #endif /* !defined(_DLFCN_H_) */

Index: src/lib/libc/dlfcn/dlfcn_elf.c
diff -u src/lib/libc/dlfcn/dlfcn_elf.c:1.5 src/lib/libc/dlfcn/dlfcn_elf.c:1.5.32.1
--- src/lib/libc/dlfcn/dlfcn_elf.c:1.5	Sun Jul 18 17:26:19 2004
+++ src/lib/libc/dlfcn/dlfcn_elf.c	Wed Oct 14 09:31:27 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: dlfcn_elf.c,v 1.5 2004/07/18 17:26:19 thorpej Exp $	*/
+/*	$NetBSD: dlfcn_elf.c,v 1.5.32.1 2009/10/14 09:31:27 sborrill Exp $	*/
 
 /*
  * Copyright (c) 2000 Takuya SHIOZAKI
@@ -27,7 +27,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: dlfcn_elf.c,v 1.5 2004/07/18 17:26:19 thorpej Exp $);
+__RCSID($NetBSD: dlfcn_elf.c,v 1.5.32.1 2009/10/14 09:31:27 sborrill Exp $);
 #endif /* LIBC_SCCS and not lint */
 
 #include namespace.h
@@ -37,12 +37,14 @@
 #undef dlsym
 #undef dlerror
 #undef dladdr
+#undef dfinfo
 
 #define	dlopen		___dlopen
 #define	dlclose		___dlclose
 #define	dlsym		___dlsym
 #define	dlerror		___dlerror
 #define	dladdr		___dladdr
+#define	dlinfo		___dlinfo
 
 #define ELFSIZE ARCH_ELFSIZE
 #include rtld.h
@@ -53,12 +55,14 @@
 __weak_alias(dlsym,___dlsym)
 __weak_alias(dlerror,___dlerror)
 __weak_alias(dladdr,___dladdr)
+__weak_alias(dlinfo,___dlinfo)
 
 __weak_alias(__dlopen,___dlopen)
 __weak_alias(__dlclose,___dlclose)
 __weak_alias(__dlsym,___dlsym)
 __weak_alias(__dlerror,___dlerror)
 __weak_alias(__dladdr,___dladdr)
+__weak_alias(__dlinfo,___dlinfo)
 #endif
 
 /*
@@ -112,3 +116,11 @@
 
 	return 0;
 }
+
+/*ARGSUSED*/
+int
+dlinfo(void *handle, int req, void *v)
+{
+
+	return -1;
+}

Index: src/libexec/ld.elf_so/reloc.c
diff -u src/libexec/ld.elf_so/reloc.c:1.96 src/libexec/ld.elf_so/reloc.c:1.96.4.1
--- src/libexec/ld.elf_so/reloc.c:1.96	Tue Jul 29 16:27:01 2008
+++ src/libexec/ld.elf_so/reloc.c	Wed Oct 14 09:31:27 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: reloc.c,v 1.96 2008/07/29 16:27:01 matt Exp $	 */
+/*	$NetBSD: reloc.c,v 1.96.4.1 2009/10/14 09:31:27 sborrill Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -39,7 +39,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: reloc.c,v 1.96 2008/07/29 16:27:01 matt Exp $);
+__RCSID($NetBSD: reloc.c,v 1.96.4.1 2009/10/14 09:31:27 sborrill Exp $);
 #endif /* not lint */
 
 #include err.h
@@ -210,6 +210,7 @@
 		obj-dlerror = dlerror;
 		obj-dlclose = dlclose;
 		obj-dladdr = dladdr;
+		obj-dlinfo = dlinfo;
 
 		dbg((fixing up PLTGOT));
 		/* Set the special PLTGOT entries. */

Index:

CVS commit: [netbsd-5] src/doc

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 09:32:05 UTC 2009

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

Log Message:
Ticket 1088


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.102 src/doc/CHANGES-5.1:1.1.2.103
--- src/doc/CHANGES-5.1:1.1.2.102	Wed Oct 14 09:18:32 2009
+++ src/doc/CHANGES-5.1	Wed Oct 14 09:32:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.102 2009/10/14 09:18:32 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.103 2009/10/14 09:32:05 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14131,3 +14131,17 @@
 	Fix man page markup.
 	[joerg, ticket #1090]
 
+include/dlfcn.h	1.20
+lib/libc/dlfcn/dlfcn_elf.c			1.6
+libexec/ld.elf_so/reloc.c			1.97
+libexec/ld.elf_so/rtld.c			1.125
+libexec/ld.elf_so/rtld.h			1.81
+libexec/ld.elf_so/symbol.c			1.48
+
+	Add Solarisa-like dlinfo() interface to the ELF dynamic
+	linker. Implement RTLD_DI_LINKMAP which returns a pointer
+	to the linkmap chain at the given object.  Other Solaris
+	queries are currently unimplemented.
+
+	[pooka, ticket #1088]
+

CVS commit: [netbsd-5] src/distrib/sets/lists

2009-10-14 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Oct 14 18:10:21 UTC 2009

Modified Files:
src/distrib/sets/lists/base [netbsd-5]: mi
src/distrib/sets/lists/xbase [netbsd-5]: mi

Log Message:
Apply patch (requested by mrg in ticket #1062):
Move entry for /usr/X11R7/lib/X11/xkb/compiled to the xbase set,
fixing non-X11 builds.


To generate a diff of this commit:
cvs rdiff -u -r1.780.2.13 -r1.780.2.14 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.69.2.4 -r1.69.2.5 src/distrib/sets/lists/xbase/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.780.2.13 src/distrib/sets/lists/base/mi:1.780.2.14
--- src/distrib/sets/lists/base/mi:1.780.2.13	Sat Oct 10 19:53:24 2009
+++ src/distrib/sets/lists/base/mi	Wed Oct 14 18:10:21 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.780.2.13 2009/10/10 19:53:24 sborrill Exp $
+# $NetBSD: mi,v 1.780.2.14 2009/10/14 18:10:21 snj Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -591,7 +591,6 @@
 ./usr/X11R7/lib/X11/xedit/lisp/progmodes	base-x11-root
 ./usr/X11R7/lib/X11/xkbbase-x11-root
 ./usr/X11R7/lib/X11/xkb/compat			base-x11-root
-./usr/X11R7/lib/X11/xkb/compiled		base-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/geometry		base-x11-root
 ./usr/X11R7/lib/X11/xkb/geometry/digital	-obsolete-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/digital_vndr	base-x11-root

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.69.2.4 src/distrib/sets/lists/xbase/mi:1.69.2.5
--- src/distrib/sets/lists/xbase/mi:1.69.2.4	Thu Sep 17 04:24:27 2009
+++ src/distrib/sets/lists/xbase/mi	Wed Oct 14 18:10:21 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.69.2.4 2009/09/17 04:24:27 snj Exp $
+# $NetBSD: mi,v 1.69.2.5 2009/10/14 18:10:21 snj Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -1568,6 +1568,7 @@
 ./usr/X11R7/lib/X11/xkb/compat/pc98			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compat/xfree86			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compat/xtest			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/compiled			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry.dir			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/README			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/amiga			-unknown-	xorg

CVS commit: [netbsd-5] src/usr.bin/printf

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 18:12:55 UTC 2009

Modified Files:
src/usr.bin/printf [netbsd-5]: printf.c

Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1091):
usr.bin/printf/printf.c:revision 1.34

Avoid segv on printf '%*s' 666.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.4.1 src/usr.bin/printf/printf.c

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

Modified files:

Index: src/usr.bin/printf/printf.c
diff -u src/usr.bin/printf/printf.c:1.33 src/usr.bin/printf/printf.c:1.33.4.1
--- src/usr.bin/printf/printf.c:1.33	Mon Jul 21 14:19:24 2008
+++ src/usr.bin/printf/printf.c	Wed Oct 14 18:12:55 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: printf.c,v 1.33 2008/07/21 14:19:24 lukem Exp $	*/
+/*	$NetBSD: printf.c,v 1.33.4.1 2009/10/14 18:12:55 sborrill Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = @(#)printf.c	8.2 (Berkeley) 3/22/95;
 #else
-__RCSID($NetBSD: printf.c,v 1.33 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: printf.c,v 1.33.4.1 2009/10/14 18:12:55 sborrill Exp $);
 #endif
 #endif /* not lint */
 
@@ -155,7 +155,7 @@
 	gargv = ++argv;
 
 #define SKIP1	#-+ 0
-#define SKIP2	*0123456789
+#define SKIP2	0123456789
 	do {
 		/*
 		 * Basic algorithm is to scan the format string for conversion
@@ -185,13 +185,23 @@
 
 			/* skip to field width */
 			fmt += strspn(fmt, SKIP1);
-			fieldwidth = *fmt == '*' ? getwidth() : -1;
+			if (*fmt == '*') {
+fmt++;
+fieldwidth = getwidth();
+			} else
+fieldwidth = -1;
 
 			/* skip to possible '.', get following precision */
 			fmt += strspn(fmt, SKIP2);
-			if (*fmt == '.')
-++fmt;
-			precision = *fmt == '*' ? getwidth() : -1;
+			if (*fmt == '.') {
+fmt++;
+if (*fmt == '*') {
+	fmt++;
+	precision = getwidth();
+} else
+	precision = -1;
+			} else
+precision = -1;
 
 			fmt += strspn(fmt, SKIP2);

CVS commit: [netbsd-5] src/doc

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 18:13:21 UTC 2009

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

Log Message:
Ticket 1091


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.103 -r1.1.2.104 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.103 src/doc/CHANGES-5.1:1.1.2.104
--- src/doc/CHANGES-5.1:1.1.2.103	Wed Oct 14 09:32:05 2009
+++ src/doc/CHANGES-5.1	Wed Oct 14 18:13:21 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.103 2009/10/14 09:32:05 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.104 2009/10/14 18:13:21 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14145,3 +14145,8 @@
 
 	[pooka, ticket #1088]
 
+usr.bin/printf/printf.c1.34
+
+	Avoid segv on printf '%*s' 666.
+	[christos, ticket #1091]
+

CVS commit: [netbsd-5] src/crypto/dist/heimdal/lib/krb5

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 18:30:32 UTC 2009

Modified Files:
src/crypto/dist/heimdal/lib/krb5 [netbsd-5]: krb5_get_creds.3
krb5_keytab.3

Log Message:
Pull up the following revisions(s) (requested by joerg in ticket #1090):
crypto/dist/heimdal/lib/krb5/krb5_keytab.3: revision 1.10
crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:  revision 1.2

Fix markup (remainder of pullup request).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.8.1 \
src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3
cvs rdiff -u -r1.9 -r1.9.8.1 src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3

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

Modified files:

Index: src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3
diff -u src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1 src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1.8.1
--- src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1	Sat Mar 22 08:37:14 2008
+++ src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3	Wed Oct 14 18:30:32 2009
@@ -30,7 +30,7 @@
 .\ SUCH DAMAGE.
 .\
 .\ $Heimdal: krb5_get_creds.3 22071 2007-11-14 20:04:50Z lha $
-.\ $NetBSD: krb5_get_creds.3,v 1.1 2008/03/22 08:37:14 mlelstv Exp $
+.\ $NetBSD: krb5_get_creds.3,v 1.1.8.1 2009/10/14 18:30:32 sborrill Exp $
 .\
 .Dd June 15, 2006
 .Dt KRB5_GET_CREDS 3
@@ -134,7 +134,7 @@
 and
 .Fn krb5_get_creds_opt_set_options
 adds and sets options to the
-.Fi krb5_get_creds_opt
+.Vt krb5_get_creds_opt
 structure .
 The possible options to set are
 .Bl -tag -width KRB5_GC_USER_USER -compact

Index: src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3
diff -u src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9 src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9.8.1
--- src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9	Sat Mar 22 08:37:14 2008
+++ src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3	Wed Oct 14 18:30:32 2009
@@ -30,7 +30,7 @@
 .\ SUCH DAMAGE.
 .\
 .\ $Heimdal: krb5_keytab.3 22071 2007-11-14 20:04:50Z lha $
-.\ $NetBSD: krb5_keytab.3,v 1.9 2008/03/22 08:37:14 mlelstv Exp $
+.\ $NetBSD: krb5_keytab.3,v 1.9.8.1 2009/10/14 18:30:32 sborrill Exp $
 .\
 .Dd August 12, 2005
 .Dt KRB5_KEYTAB 3
@@ -204,7 +204,7 @@
 For compatibility with other Kerberos implemtation
 .Li WRFILE
 and
-.LI JAVA14
+.Li JAVA14
 is also accepted.
 .Li WRFILE
 has the same format as
@@ -380,7 +380,7 @@
 function
 .Fn krb5_kt_compare
 is used, so the wildcard rules applies to the argument of
-.F krb5_kt_get_entry
+.Fn krb5_kt_get_entry
 too.
 On success the returne entry must be freed with
 .Fn krb5_kt_free_entry .

CVS commit: [netbsd-5] src/doc

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 18:33:48 UTC 2009

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

Log Message:
Remainder of ticket 1090 (+ whitespace changes)


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.105 -r1.1.2.106 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.105 src/doc/CHANGES-5.1:1.1.2.106
--- src/doc/CHANGES-5.1:1.1.2.105	Wed Oct 14 18:17:01 2009
+++ src/doc/CHANGES-5.1	Wed Oct 14 18:33:48 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.105 2009/10/14 18:17:01 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.106 2009/10/14 18:33:48 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14128,6 +14128,8 @@
 	[pooka, ticket #1089]
 
 crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3	1.2
+crypto/dist/heimdal/lib/krb5/krb5_keytab.3	1.10
+crypto/dist/heimdal/lib/krb5/krb5_get_creds.3	1.2
 
 	Fix man page markup.
 	[joerg, ticket #1090]
@@ -14143,7 +14145,6 @@
 	linker. Implement RTLD_DI_LINKMAP which returns a pointer
 	to the linkmap chain at the given object.  Other Solaris
 	queries are currently unimplemented.
-
 	[pooka, ticket #1088]
 
 usr.bin/printf/printf.c1.34

CVS commit: [netbsd-5] src/etc

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 20:05:08 UTC 2009

Modified Files:
src/etc [netbsd-5]: Makefile
Removed Files:
src/etc [netbsd-5]: audit-packages.conf

Log Message:
Pull up the following additional revisions(s) required by ticket #784:
etc/Makefile:   revision 1.365
etc/audit-packages.conf:remove

Fix update release build (pointed out by tsutsui).


To generate a diff of this commit:
cvs rdiff -u -r1.359.2.4 -r1.359.2.5 src/etc/Makefile
cvs rdiff -u -r1.1 -r0 src/etc/audit-packages.conf

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

Modified files:

Index: src/etc/Makefile
diff -u src/etc/Makefile:1.359.2.4 src/etc/Makefile:1.359.2.5
--- src/etc/Makefile:1.359.2.4	Tue Sep 15 06:01:40 2009
+++ src/etc/Makefile	Wed Oct 14 20:05:08 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.359.2.4 2009/09/15 06:01:40 snj Exp $
+#	$NetBSD: Makefile,v 1.359.2.5 2009/10/14 20:05:08 sborrill Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -88,7 +88,7 @@
 BINOWN= root
 BINGRP= wheel
 UTMPGRP= utmp
-BIN1+=	audit-packages.conf bootptab changelist csh.cshrc csh.login \
+BIN1+=	bootptab changelist csh.cshrc csh.login \
 	csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \
 	ftpusers gettytab group hosts hosts.lpd inetd.conf lkm.conf \
 	locate.conf login.conf mailer.conf man.conf monthly monthly.conf \

CVS commit: [netbsd-5] src/doc

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 20:06:28 UTC 2009

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

Log Message:
Additional changes required by ticket 784


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.106 -r1.1.2.107 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.106 src/doc/CHANGES-5.1:1.1.2.107
--- src/doc/CHANGES-5.1:1.1.2.106	Wed Oct 14 18:33:48 2009
+++ src/doc/CHANGES-5.1	Wed Oct 14 20:06:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.106 2009/10/14 18:33:48 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.107 2009/10/14 20:06:27 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -675,6 +675,8 @@
 distrib/sets/lists/base/mi			patch
 distrib/sets/lists/etc/mi			patch
 distrib/sets/lists/man/mi			patch
+etc/Makefile	1.365
+etc/audit-packages.confremoved
 external/bsd/pkg_install/Makefile.inc		patch
 external/bsd/pkg_install/prepare-import.sh	patch
 external/bsd/pkg_install/dist/add/add.h		pkg_install-20090528

CVS commit: [netbsd-5] src/doc

2009-10-14 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Wed Oct 14 20:42:42 UTC 2009

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

Log Message:
Ticket 1084


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.107 src/doc/CHANGES-5.1:1.1.2.108
--- src/doc/CHANGES-5.1:1.1.2.107	Wed Oct 14 20:06:27 2009
+++ src/doc/CHANGES-5.1	Wed Oct 14 20:42:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.107 2009/10/14 20:06:27 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.108 2009/10/14 20:42:42 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14154,3 +14154,28 @@
 	Avoid segv on printf '%*s' 666.
 	[christos, ticket #1091]
 
+usr.bin/sort/Makefile1.6-1.8
+usr.bin/sort/append.c1.15-1.22
+usr.bin/sort/fields.c1.20-1.30
+usr.bin/sort/files.c1.27-1.40
+usr.bin/sort/fsort.c1.33-1.45
+usr.bin/sort/fsort.h1.14-1.17
+usr.bin/sort/init.c1.19-1.23
+usr.bin/sort/msort.c1.19-1.28
+usr.bin/sort/radix_sort.c			1.1-1.4
+usr.bin/sort/sort.11.27-1.29
+usr.bin/sort/sort.c1.47-1.56
+usr.bin/sort/sort.h1.20-1.30
+usr.bin/sort/tmp.c1.14-1.15
+
+	Only use radix sort for in-memory sort, always merge temporary files.
+	Use a local radixsort() function so we can pass record length.
+	Avoid use of weight tables for key compares.
+	Fix generation of keys for numbers, negate value for reverse sort.
+	Write file in reverse-key order for 'sort -n'.
+	'sort -S' now does a posix sort (sort matching keys by record data).
+	Ensure merge sort doesn't have too many temporary files open.
+	Fixes: PR#18614 PR#27257 PR#25551 PR#22182 PR#31095 PR#30504
+	PR#36816 PR#37860 PR#39308 PR#42094
+	[dsl, ticket #1084]
+

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

2009-10-11 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sun Oct 11 18:03:22 UTC 2009

Modified Files:
src/sys/kern [netbsd-5]: tty.c

Log Message:
Pull up the following revisions(s) (requested by dsl in ticket #1087):
sys/kern/tty.c: revision 1.234

Check for zero length read here - and return zero. Without this there is a
simple local-user panic in ureadc().


To generate a diff of this commit:
cvs rdiff -u -r1.227.4.1 -r1.227.4.2 src/sys/kern/tty.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/tty.c
diff -u src/sys/kern/tty.c:1.227.4.1 src/sys/kern/tty.c:1.227.4.2
--- src/sys/kern/tty.c:1.227.4.1	Fri Feb  6 02:05:18 2009
+++ src/sys/kern/tty.c	Sun Oct 11 18:03:21 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty.c,v 1.227.4.1 2009/02/06 02:05:18 snj Exp $	*/
+/*	$NetBSD: tty.c,v 1.227.4.2 2009/10/11 18:03:21 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.227.4.1 2009/02/06 02:05:18 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.227.4.2 2009/10/11 18:03:21 sborrill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1655,6 +1655,9 @@
 	long		lflag, slp;
 	struct timeval	now, stime;
 
+	if (uio-uio_resid == 0)
+		return 0;
+
 	stime.tv_usec = 0;	/* XXX gcc */
 	stime.tv_sec = 0;	/* XXX gcc */

CVS commit: [netbsd-5] src/doc

2009-10-11 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sun Oct 11 18:04:30 UTC 2009

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

Log Message:
Ticket 1087


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.99 src/doc/CHANGES-5.1:1.1.2.100
--- src/doc/CHANGES-5.1:1.1.2.99	Sat Oct 10 21:09:08 2009
+++ src/doc/CHANGES-5.1	Sun Oct 11 18:04:30 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.99 2009/10/10 21:09:08 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.100 2009/10/11 18:04:30 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14113,3 +14113,9 @@
 	fix a segfault caused by jemalloc when mmap() failed.
 	[phx, ticket #1085]
 
+sys/kern/tty.c	1.234
+
+	Check for zero length read here - and return zero. Without
+	this there is a simple local-user panic in ureadc().
+	[dsl, ticket #1087]
+

CVS commit: [netbsd-5] src/usr.sbin/acpitools/aml

2009-10-10 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sat Oct 10 18:16:25 UTC 2009

Modified Files:
src/usr.sbin/acpitools/aml [netbsd-5]: aml_name.c

Log Message:
Pull up the following revisions(s) (requested by cegger in ticket #1078):
usr.sbin/acpitools/aml/aml_name.c:  revision 1.4

Check validity of parent and so fix potential segfault.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.10.1 src/usr.sbin/acpitools/aml/aml_name.c

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

Modified files:

Index: src/usr.sbin/acpitools/aml/aml_name.c
diff -u src/usr.sbin/acpitools/aml/aml_name.c:1.3 src/usr.sbin/acpitools/aml/aml_name.c:1.3.10.1
--- src/usr.sbin/acpitools/aml/aml_name.c:1.3	Tue Jan 15 19:08:00 2008
+++ src/usr.sbin/acpitools/aml/aml_name.c	Sat Oct 10 18:16:25 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_name.c,v 1.3 2008/01/15 19:08:00 jmcneill Exp $	*/
+/*	$NetBSD: aml_name.c,v 1.3.10.1 2009/10/10 18:16:25 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 1999 Takanori Watanabe
@@ -31,7 +31,7 @@
  *	$FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_name.c,v 1.3 2000/11/09 06:24:45 iwasaki Exp $
  */
 #include sys/cdefs.h
-__RCSID($NetBSD: aml_name.c,v 1.3 2008/01/15 19:08:00 jmcneill Exp $);
+__RCSID($NetBSD: aml_name.c,v 1.3.10.1 2009/10/10 18:16:25 sborrill Exp $);
 
 #include sys/param.h
 
@@ -283,11 +283,12 @@
 	newname-parent = parent;
 	newname-child = NULL;
 	newname-property = NULL;
-	if (parent-child)
+	if (parent  parent-child)
 		newname-brother = parent-child;
 	else
 		newname-brother = NULL;
-	parent-child = newname;
+	if (parent)
+		parent-child = newname;
 
 	newname-chain = name_group_list-head;
 	name_group_list-head = newname;

CVS commit: [netbsd-5] src/doc

2009-10-10 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sat Oct 10 18:17:29 UTC 2009

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

Log Message:
Ticket 1078


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.94 -r1.1.2.95 src/doc/CHANGES-5.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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.94 src/doc/CHANGES-5.1:1.1.2.95
--- src/doc/CHANGES-5.1:1.1.2.94	Fri Oct  9 08:09:48 2009
+++ src/doc/CHANGES-5.1	Sat Oct 10 18:17:29 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.94 2009/10/09 08:09:48 sborrill Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.95 2009/10/10 18:17:29 sborrill Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -14044,8 +14044,13 @@
 
 distrib/utils/sysinst/util.c			1.160
 
-	usr/X11R7/lib/X11/xkb/symbols/pc went from a directory to a
+	/usr/X11R7/lib/X11/xkb/symbols/pc went from a directory to a
 	file, so on upgrades we need to remove it before extracting
 	the xbase set.
 	[snj, ticket #1081]
 
+usr.sbin/acpitools/aml/aml_name.c		1.4
+
+	Check validity of parent and so fix potential segfault.
+	[cegger, ticket #1078]
+

CVS commit: [netbsd-5] src

2009-10-10 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Sat Oct 10 19:53:25 UTC 2009

Modified Files:
src/distrib/sets/lists/base [netbsd-5]: mi
src/distrib/sets/lists/xcomp [netbsd-5]: mi
src/etc/mtree [netbsd-5]: NetBSD.dist
src/external/mit/xorg/lib/dri [netbsd-5]: dri.mk
src/external/mit/xorg/lib/dri/libmesa [netbsd-5]: Makefile
src/external/mit/xorg/lib/libGL [netbsd-5]: Makefile
src/external/mit/xorg/lib/libdrm [netbsd-5]: Makefile
src/external/mit/xorg/lib/libdrm/drm [netbsd-5]: Makefile
src/external/mit/xorg/lib/libdrm_intel [netbsd-5]: Makefile
src/external/mit/xorg/server/drivers [netbsd-5]: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-glint [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017 [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/ivch [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/sil164 [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410 [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-mga [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-savage [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-tdfx [netbsd-5]:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-via [netbsd-5]:
Makefile
src/external/mit/xorg/server/xorg-server/GL/glx [netbsd-5]:
Makefile.glx
src/external/mit/xorg/server/xorg-server/glx [netbsd-5]: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri [netbsd-5]:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2 [netbsd-5]:
Makefile

Log Message:
Pull up the following revisions(s) (requested by snj in ticket #1079):
distrib/sets/lists/base/mi: patch
etc/mtree/NetBSD.dist:  patch
distrib/sets/lists/xcomp/mi:revision 1.100
external/mit/xorg/lib/dri/dri.mk:   revision 1.8
external/mit/xorg/lib/dri/libmesa/Makefile: revision 1.4
external/mit/xorg/lib/libGL/Makefile:   revision 1.10
external/mit/xorg/lib/libdrm/Makefile:  revision 1.5
external/mit/xorg/lib/libdrm/drm/Makefile:  revision 1.3
external/mit/xorg/lib/libdrm_intel/Makefile:revision 1.3
external/mit/xorg/server/drivers/Makefile.xf86-driver:  revision 1.16
external/mit/xorg/server/drivers/xf86-video-glint/Makefile: 
revision 1.7
external/mit/xorg/server/drivers/xf86-video-intel/Makefile: 
revision 1.7
external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:  
revision 1.2
external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:  
revision 1.2
external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:
revision 1.2
external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:  
revision 1.2
external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:  
revision 1.2
external/mit/xorg/server/drivers/xf86-video-mga/Makefile:   
revision 1.7
external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:
revision 1.5
external/mit/xorg/server/drivers/xf86-video-savage/Makefile:
revision 1.7
external/mit/xorg/server/drivers/xf86-video-sis/Makefile:   
revision 1.7
external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:  
revision 1.6
external/mit/xorg/server/drivers/xf86-video-via/Makefile:   
revision 1.5
external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:   
revision 1.5
external/mit/xorg/server/xorg-server/glx/Makefile.glx:  revision 1.4
external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:   
revision 1.7
external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:  
revision 1.4

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


To generate a diff of this commit:
cvs rdiff -u -r1.780.2.12 -r1.780.2.13 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.71.2.5 -r1.71.2.6 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.385.2.4 -r1.385.2.5 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.3.4.3 -r1.3.4.4

< 8 9 10 11 12 13 14 15 16 17 >

1201 - 1300 of 1819 matches

Mail list logo