CVS commit: [uebayasi-xip] src/sys/miscfs/specfs

2010-05-27 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Fri May 28 06:51:41 UTC 2010

Modified Files:
src/sys/miscfs/specfs [uebayasi-xip]: specdev.h

Log Message:
specdev::v_phys_addr is now specdev::v_physseg.


To generate a diff of this commit:
cvs rdiff -u -r1.39.2.2 -r1.39.2.3 src/sys/miscfs/specfs/specdev.h

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

Modified files:

Index: src/sys/miscfs/specfs/specdev.h
diff -u src/sys/miscfs/specfs/specdev.h:1.39.2.2 src/sys/miscfs/specfs/specdev.h:1.39.2.3
--- src/sys/miscfs/specfs/specdev.h:1.39.2.2	Wed Apr 28 16:33:47 2010
+++ src/sys/miscfs/specfs/specdev.h	Fri May 28 06:51:41 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: specdev.h,v 1.39.2.2 2010/04/28 16:33:47 uebayasi Exp $	*/
+/*	$NetBSD: specdev.h,v 1.39.2.3 2010/05/28 06:51:41 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
 #define v_rdev		v_specnode->sn_rdev
 #define v_speclockf	v_specnode->sn_dev->sd_lockf
 #define v_specmountpoint v_specnode->sn_dev->sd_mountpoint
-#define v_phys_addr	v_specnode->sn_dev->sd_phys_addr
+#define v_physseg	v_specnode->sn_dev->sd_physseg
 
 /*
  * Special device management



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

2010-05-27 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Fri May 28 06:41:16 UTC 2010

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

Log Message:
Remove an old XXX comment.  Fix a conditional build.


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

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

Modified files:

Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.36 src/sys/uvm/uvm_page.c:1.153.2.37
--- src/sys/uvm/uvm_page.c:1.153.2.36	Fri Apr 30 14:44:38 2010
+++ src/sys/uvm/uvm_page.c	Fri May 28 06:41:15 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.153.2.36 2010/04/30 14:44:38 uebayasi Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.153.2.37 2010/05/28 06:41:15 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.36 2010/04/30 14:44:38 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.37 2010/05/28 06:41:15 uebayasi Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -126,7 +126,6 @@
 /*
  * physical memory config is stored in vm_physmem.
  */
-/* XXXUEBS make these array of pointers */
 /* XXXUEBS merge these two */
 
 SIMPLEQ_HEAD(vm_physseg_freelist, vm_physseg);
@@ -940,7 +939,6 @@
 struct vm_physseg **segs, int nsegs, const paddr_t start, const paddr_t end)
 {
 	struct vm_physseg *ps;
-	int lcv;
 
 	ps = SIMPLEQ_FIRST(freelist);
 	KASSERT(ps != NULL);
@@ -951,6 +949,7 @@
 	segs[nsegs] = ps;
 #elif (VM_PHYSSEG_STRAT == VM_PSTRAT_BSEARCH)
 	{
+		int lcv;
 		int x;
 		/* sort by address for binary search */
 		for (lcv = 0 ; lcv < nsegs ; lcv++)
@@ -963,6 +962,7 @@
 	}
 #elif (VM_PHYSSEG_STRAT == VM_PSTRAT_BIGFIRST)
 	{
+		int lcv;
 		int x;
 		/* sort by largest segment first */
 		for (lcv = 0 ; lcv < nsegs ; lcv++)



CVS commit: src

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri May 28 06:26:55 UTC 2010

Modified Files:
src/distrib/sets/lists/xbase: md.amd64 md.i386
src/distrib/sets/lists/xcomp: md.amd64 md.i386
src/external/mit/xorg/lib: Makefile
Added Files:
src/external/mit/xorg/lib/libchromeXvMC: Makefile shlib_version

Log Message:
build libchromeXvMC on x86.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libchromeXvMC/Makefile \
src/external/mit/xorg/lib/libchromeXvMC/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/xbase/md.amd64
diff -u src/distrib/sets/lists/xbase/md.amd64:1.5 src/distrib/sets/lists/xbase/md.amd64:1.6
--- src/distrib/sets/lists/xbase/md.amd64:1.5	Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xbase/md.amd64	Fri May 28 06:26:55 2010
@@ -1,5 +1,8 @@
-# $NetBSD: md.amd64,v 1.5 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: md.amd64,v 1.6 2010/05/28 06:26:55 mrg Exp $
 ./usr/X11R7/share/pciids/pci.ids		-unknown-		obsolete
+./usr/X11R7/lib/libchromeXvMC.so		-unknown-		xorg
+./usr/X11R7/lib/libchromeXvMC.so.0		-unknown-		xorg
+./usr/X11R7/lib/libchromeXvMC.so.0.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg

Index: src/distrib/sets/lists/xbase/md.i386
diff -u src/distrib/sets/lists/xbase/md.i386:1.21 src/distrib/sets/lists/xbase/md.i386:1.22
--- src/distrib/sets/lists/xbase/md.i386:1.21	Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xbase/md.i386	Fri May 28 06:26:55 2010
@@ -1,5 +1,8 @@
-# $NetBSD: md.i386,v 1.21 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: md.i386,v 1.22 2010/05/28 06:26:55 mrg Exp $
 ./usr/X11R7/share/pciids/pci.ids		-unknown-		obsolete
+./usr/X11R7/lib/libchromeXvMC.so		-unknown-		xorg
+./usr/X11R7/lib/libchromeXvMC.so.0		-unknown-		xorg
+./usr/X11R7/lib/libchromeXvMC.so.0.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg

Index: src/distrib/sets/lists/xcomp/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.26 src/distrib/sets/lists/xcomp/md.amd64:1.27
--- src/distrib/sets/lists/xcomp/md.amd64:1.26	Sun May 23 21:32:50 2010
+++ src/distrib/sets/lists/xcomp/md.amd64	Fri May 28 06:26:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.26 2010/05/23 21:32:50 mrg Exp $
+# $NetBSD: md.amd64,v 1.27 2010/05/28 06:26:55 mrg Exp $
 ./usr/X11R6/include/xf86Optrec.h			-unknown-	x11
 ./usr/X11R6/include/xf86Parser.h			-unknown-	x11
 ./usr/X11R6/man/cat3/XF86VidMode.0			-unknown-	.cat,x11
@@ -71,6 +71,10 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3	-unknown-	.man,x11
 ./usr/X11R6/man/man4/fpit.4-unknown-	.man,x11
 ./usr/X11R7/include/intel_bufmgr.h			-unknown-	obsolete
+./usr/X11R7/lib/libchromeXvMC.a-unknown-	xorg
+./usr/X11R7/lib/libchromeXvMC_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/libchromeXvMC_p.a			-unknown-	profile,xorg
+./usr/X11R7/lib/libchromeXvMC_pic.a			-unknown-	xorg
 ./usr/X11R7/lib/libdrm_intel.a-unknown-	xorg
 ./usr/X11R7/lib/libdrm_intel_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libdrm_intel_p.a			-unknown-	profile,xorg
@@ -96,6 +100,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/xorgconfig.debug	-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.0.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi810_dri.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi915_dri.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libi965_dri.so.0.debug	-unknown-		xorg,debug
@@ -170,4 +175,5 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/libxf8_16bpp.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/lint/llib-lchromeXvMC.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-ldrm_intel.ln			-unknown-	lint,xorg

Index: src/distrib/sets/lists/xcomp/md.i386
diff -u src/distrib/sets/lists/xcomp/md.i386:1.32 src/distrib/sets/lists/xcomp/md.i386:1.33
--- src/distrib/sets/lists/xcomp/md.i386:1.32	Sun May 23 21:32:50 2010
+++ src/distrib/sets/lists/xcomp/md.i386	Fri May 28 06:26:55 2010
@@ -1,4 +1,

CVS commit: src/share/mk

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri May 28 06:24:59 UTC 2010

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
add / retire some xf86-video drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.625 -r1.626 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.625 src/share/mk/bsd.own.mk:1.626
--- src/share/mk/bsd.own.mk:1.625	Fri Apr 23 19:41:03 2010
+++ src/share/mk/bsd.own.mk	Fri May 28 06:24:59 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.625 2010/04/23 19:41:03 joerg Exp $
+#	$NetBSD: bsd.own.mk,v 1.626 2010/05/28 06:24:59 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -943,10 +943,13 @@
 .endfor
 
 .for _v in \
-	ag10e apm ark ast ati chips cirrus crime cyrix glint i128 i740 igs \
-	imstt intel mach64 mga neomagic newport nsc nv nvxbox pnozz r128 \
-	radeonhd rendition s3 s3virge savage siliconmotion sis suncg14 suncg6 \
-	sunffb sunleo suntcx tdfx tga trident tseng vesa vga via vmware wsfb
+	ag10e apm ark ast ati chips cirrus crime \
+	geode glint i128 i740 igs imstt intel mach64 mga \
+	neomagic newport nsc nv nvxbox openchrome pnozz \
+	r128 radeonhd rendition \
+	s3 s3virge savage siliconmotion sis suncg14 \
+	suncg6 sunffb sunleo suntcx \
+	tdfx tga trident tseng vesa vga via vmware wsfb
 	
 X11SRCDIR.xf86-video-${_v}?=	${X11SRCDIRMIT}/xf86-video-${_v}/dist
 .endfor



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

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri May 28 06:22:05 UTC 2010

Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libglut: Makefile

Log Message:
we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libglut/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/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.13 src/external/mit/xorg/lib/libGL/Makefile:1.14
--- src/external/mit/xorg/lib/libGL/Makefile:1.13	Sun May 23 01:19:34 2010
+++ src/external/mit/xorg/lib/libGL/Makefile	Fri May 28 06:22:05 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2010/05/23 01:19:34 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2010/05/28 06:22:05 mrg Exp $
 
 .include 
 
@@ -100,7 +100,7 @@
 
 PKGCONFIG=	gl
 PKGDIST.gl=	${X11SRCDIR.MesaLib}/src/mesa
-PKGCONFIG_VERSION.gl=	7.4.4
+PKGCONFIG_VERSION.gl=	7.7.1
 
 .include 
 .include 

Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.5 src/external/mit/xorg/lib/libGLU/Makefile:1.6
--- src/external/mit/xorg/lib/libGLU/Makefile:1.5	Sun May 23 01:19:34 2010
+++ src/external/mit/xorg/lib/libGLU/Makefile	Fri May 28 06:22:05 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2010/05/23 01:19:34 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2010/05/28 06:22:05 mrg Exp $
 
 NOLINT=		1	# XTODO: tess.ln SIGSEGVs lint :(
 
@@ -84,7 +84,7 @@
 
 PKGCONFIG=	glu
 PKGDIST.glu=	${X11SRCDIR.MesaLib}/src/glu
-PKGCONFIG_VERSION.glu=	7.4.4
+PKGCONFIG_VERSION.glu=	7.7.1
 
 .include 
 .include 

Index: src/external/mit/xorg/lib/libglut/Makefile
diff -u src/external/mit/xorg/lib/libglut/Makefile:1.4 src/external/mit/xorg/lib/libglut/Makefile:1.5
--- src/external/mit/xorg/lib/libglut/Makefile:1.4	Sun May 23 01:19:34 2010
+++ src/external/mit/xorg/lib/libglut/Makefile	Fri May 28 06:22:05 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2010/05/23 01:19:34 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2010/05/28 06:22:05 mrg Exp $
 
 .include 
 
@@ -74,7 +74,7 @@
 
 PKGCONFIG=	glut
 PKGDIST.glut=	${X11SRCDIR.MesaGLUT}/src/glut/glx
-PKGCONFIG_VERSION.glut=	7.4.4
+PKGCONFIG_VERSION.glut=	7.7.1
 
 .include 
 .include 



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

2010-05-27 Thread Luke Mewburn
Module Name:src
Committed By:   lukem
Date:   Fri May 28 05:39:56 UTC 2010

Modified Files:
src/distrib/sets/lists/xcomp: md.cats

Log Message:
fix MKDEBUG=yes for X11R7 libs


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xcomp/md.cats

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/xcomp/md.cats
diff -u src/distrib/sets/lists/xcomp/md.cats:1.9 src/distrib/sets/lists/xcomp/md.cats:1.10
--- src/distrib/sets/lists/xcomp/md.cats:1.9	Sun Mar 14 23:19:18 2010
+++ src/distrib/sets/lists/xcomp/md.cats	Fri May 28 05:39:56 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.9 2010/03/14 23:19:18 mrg Exp $
+# $NetBSD: md.cats,v 1.10 2010/05/28 05:39:56 lukem Exp $
 ./usr/X11R6/include/xf86Optrec.h			-unknown-	x11
 ./usr/X11R6/include/xf86Parser.h			-unknown-	x11
 ./usr/X11R6/man/cat3/XF86VidMode.0			-unknown-	.cat,x11
@@ -73,3 +73,47 @@
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		-unknown-	debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libapm_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libark_drv.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libast_drv.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libcirrus_alpine.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libcirrus_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libcirrus_laguna.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libglint_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libi128_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libi740_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libneomagic_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libnv_drv.so.2.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libradeon_drv.so.6.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libradeonhd_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libs3_drv.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libs3virge_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libsavage_drv.so.2.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libsiliconmotion_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libtdfx_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libtga_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libtrident_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libtseng_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvesa_drv.so.2.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libextmod.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libglx.so.0.debug -unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/librecord.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libshadow.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libexa.so.0.debug		-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug		-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libi2c.so.0.debug		-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libshadowfb.so.0.d

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

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri May 28 04:55:07 UTC 2010

Modified Files:
src/distrib/sets/lists/xserver: md.i386

Log Message:
geode_drv is a .so.2.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/xserver/md.i386

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.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.77 src/distrib/sets/lists/xserver/md.i386:1.78
--- src/distrib/sets/lists/xserver/md.i386:1.77	Fri May 28 04:12:02 2010
+++ src/distrib/sets/lists/xserver/md.i386	Fri May 28 04:55:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.77 2010/05/28 04:12:02 mrg Exp $
+# $NetBSD: md.i386,v 1.78 2010/05/28 04:55:07 mrg Exp $
 ./usr/X11R6/bin/X	-unknown-	x11
 ./usr/X11R6/bin/XFree86	-unknown-	x11
 ./usr/X11R6/bin/gtf	-unknown-	x11
@@ -489,7 +489,7 @@
 ./usr/X11R7/lib/modules/drivers/glint_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/geode_drv.so		-unknown-	xorg
-./usr/X11R7/lib/modules/drivers/geode_drv.so.0		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/geode_drv.so.2		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/i128_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/i128_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/i740_drv.so		-unknown-	xorg



CVS commit: src/external/mit/xorg/server/drivers

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri May 28 04:16:07 UTC 2010

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
fix compile error in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/external/mit/xorg/server/drivers/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.41 src/external/mit/xorg/server/drivers/Makefile:1.42
--- src/external/mit/xorg/server/drivers/Makefile:1.41	Fri May 28 04:12:02 2010
+++ src/external/mit/xorg/server/drivers/Makefile	Fri May 28 04:16:06 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.41 2010/05/28 04:12:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.42 2010/05/28 04:16:06 mrg Exp $
 
 SUBDIR= \
 	xf86-input-keyboard \
@@ -7,7 +7,7 @@
 
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+= \
-	xf86-input-elographics
+	xf86-input-elographics \
 	xf86-video-geode
 .endif
 



CVS commit: src/doc

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri May 28 04:12:58 UTC 2010

Modified Files:
src/doc: CHANGES

Log Message:
X11: Added support for xf86-video-geode and xf86-video-openchrome.


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

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1396 src/doc/CHANGES:1.1397
--- src/doc/CHANGES:1.1396	Mon May 24 20:02:39 2010
+++ src/doc/CHANGES	Fri May 28 04:12:58 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1396 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1397 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -620,3 +620,5 @@
 	radeondrm(4): Ported across several updates from FreeBSD drm, Mesa 7.7.1
 		r600 (Radeon HD 3000/4000 series) driver now works.
 		[mrg 20100523]
+	X11: Added support for xf86-video-geode and xf86-video-openchrome.
+		[mrg 20100527]



CVS commit: src

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri May 28 04:12:02 UTC 2010

Modified Files:
src/distrib/sets/lists/xserver: md.amd64 md.i386
src/external/mit/xorg/server/drivers: Makefile

Log Message:
enable xf86-video-openchrome for x86 and xf86-video-geode for i386.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/server/drivers/Makefile

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.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.58 src/distrib/sets/lists/xserver/md.amd64:1.59
--- src/distrib/sets/lists/xserver/md.amd64:1.58	Sun May 23 21:32:51 2010
+++ src/distrib/sets/lists/xserver/md.amd64	Fri May 28 04:12:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.58 2010/05/23 21:32:51 mrg Exp $
+# $NetBSD: md.amd64,v 1.59 2010/05/28 04:12:02 mrg Exp $
 ./usr/X11R6/bin/X	-unknown-	x11
 ./usr/X11R6/bin/XFree86	-unknown-	x11
 ./usr/X11R6/bin/gtf	-unknown-	x11
@@ -438,6 +438,8 @@
 ./usr/X11R7/lib/modules/drivers/nsc_drv.so.2		-unknown-	obsolete
 ./usr/X11R7/lib/modules/drivers/nv_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/nv_drv.so.2		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/openchrome_drv.so	-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so.6		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/radeon_drv.so		-unknown-	xorg
@@ -620,6 +622,7 @@
 ./usr/X11R7/man/cat4/neomagic.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/nsc.0-unknown-	obsolete
 ./usr/X11R7/man/cat4/nv.0-unknown-	.cat,xorg
+./usr/X11R7/man/cat4/openchrome.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/r128.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/radeon.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/radeonhd.0-unknown-	.cat,xorg
@@ -663,6 +666,7 @@
 ./usr/X11R7/man/html4/neomagic.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/nsc.html-unknown-	obsolete
 ./usr/X11R7/man/html4/nv.html-unknown-	html,xorg
+./usr/X11R7/man/html4/openchrome.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/r128.html-unknown-	html,xorg
 ./usr/X11R7/man/html4/radeon.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/radeonhd.html			-unknown-	html,xorg
@@ -706,6 +710,7 @@
 ./usr/X11R7/man/man4/neomagic.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/nsc.4-unknown-	obsolete
 ./usr/X11R7/man/man4/nv.4-unknown-	.man,xorg
+./usr/X11R7/man/man4/openchrome.4			-unknown-	.man,xorg
 ./usr/X11R7/man/man4/r128.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/radeon.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/radeonhd.4-unknown-	.man,xorg

Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.76 src/distrib/sets/lists/xserver/md.i386:1.77
--- src/distrib/sets/lists/xserver/md.i386:1.76	Sun May 23 21:32:51 2010
+++ src/distrib/sets/lists/xserver/md.i386	Fri May 28 04:12:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.76 2010/05/23 21:32:51 mrg Exp $
+# $NetBSD: md.i386,v 1.77 2010/05/28 04:12:02 mrg Exp $
 ./usr/X11R6/bin/X	-unknown-	x11
 ./usr/X11R6/bin/XFree86	-unknown-	x11
 ./usr/X11R6/bin/gtf	-unknown-	x11
@@ -488,6 +488,8 @@
 ./usr/X11R7/lib/modules/drivers/elographics_drv.so.1	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/glint_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/geode_drv.so		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/geode_drv.so.0		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/i128_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/i128_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/i740_drv.so		-unknown-	xorg
@@ -512,6 +514,8 @@
 ./usr/X11R7/lib/modules/drivers/nsc_drv.so.2		-unknown-	obsolete
 ./usr/X11R7/lib/modules/drivers/nv_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/nv_drv.so.2		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/openchrome_drv.so	-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so.6		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/radeon_drv.so		-unknown-	xorg
@@ -722,6 +726,7 @@
 ./usr/X11R7/man/cat4/neomagic.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/nsc.0-unknown-	obsolete
 ./usr/X11R7/man/cat4/nv.0-unknown-	.cat,xorg
+./usr/X11R7/man/cat4/openchrome.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/r128.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/radeon.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/radeonhd.0-unknown-	.cat,xorg
@@ -766,6 +771,7 @@
 ./usr/X11R7/man/html4/neomagic.html			-unknown-	html

CVS commit: src/sys/dev/pci

2010-05-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri May 28 02:38:41 UTC 2010

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

Log Message:
Remove opt_pci.h - it's not needed for anything.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/pci_verbose.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/pci_verbose.c
diff -u src/sys/dev/pci/pci_verbose.c:1.4 src/sys/dev/pci/pci_verbose.c:1.5
--- src/sys/dev/pci/pci_verbose.c:1.4	Thu May 27 23:13:10 2010
+++ src/sys/dev/pci/pci_verbose.c	Fri May 28 02:38:41 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_verbose.c,v 1.4 2010/05/27 23:13:10 pgoyette Exp $	*/
+/*	$NetBSD: pci_verbose.c,v 1.5 2010/05/28 02:38:41 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,11 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_verbose.c,v 1.4 2010/05/27 23:13:10 pgoyette Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_pci.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: pci_verbose.c,v 1.5 2010/05/28 02:38:41 pgoyette Exp $");
 
 #include 
 



CVS commit: xsrc/external/mit/xf86-video-cyrix/dist

2010-05-27 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri May 28 02:37:58 UTC 2010

Removed Files:
xsrc/external/mit/xf86-video-cyrix/dist: COPYING ChangeLog Makefile.am
Makefile.in README README.sgml aclocal.m4 config.guess config.h.in
config.sub configure configure.ac depcomp install-sh ltmain.sh
missing
xsrc/external/mit/xf86-video-cyrix/dist/man: Makefile.am Makefile.in
cyrix.man
xsrc/external/mit/xf86-video-cyrix/dist/src: Makefile.am Makefile.in
cyrix.h cyrix_accel.c cyrix_bank.c cyrix_driver.c cyrix_helper.c
cyrix_shadow.c

Log Message:
obsolete xf86-video-cyrix sources.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-cyrix/dist/COPYING \
xsrc/external/mit/xf86-video-cyrix/dist/ChangeLog \
xsrc/external/mit/xf86-video-cyrix/dist/Makefile.am \
xsrc/external/mit/xf86-video-cyrix/dist/Makefile.in \
xsrc/external/mit/xf86-video-cyrix/dist/README \
xsrc/external/mit/xf86-video-cyrix/dist/README.sgml \
xsrc/external/mit/xf86-video-cyrix/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-cyrix/dist/config.guess \
xsrc/external/mit/xf86-video-cyrix/dist/config.h.in \
xsrc/external/mit/xf86-video-cyrix/dist/config.sub \
xsrc/external/mit/xf86-video-cyrix/dist/configure \
xsrc/external/mit/xf86-video-cyrix/dist/configure.ac \
xsrc/external/mit/xf86-video-cyrix/dist/depcomp \
xsrc/external/mit/xf86-video-cyrix/dist/install-sh \
xsrc/external/mit/xf86-video-cyrix/dist/ltmain.sh \
xsrc/external/mit/xf86-video-cyrix/dist/missing
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-cyrix/dist/man/Makefile.am \
xsrc/external/mit/xf86-video-cyrix/dist/man/Makefile.in \
xsrc/external/mit/xf86-video-cyrix/dist/man/cyrix.man
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-cyrix/dist/src/Makefile.am \
xsrc/external/mit/xf86-video-cyrix/dist/src/Makefile.in \
xsrc/external/mit/xf86-video-cyrix/dist/src/cyrix.h \
xsrc/external/mit/xf86-video-cyrix/dist/src/cyrix_accel.c \
xsrc/external/mit/xf86-video-cyrix/dist/src/cyrix_bank.c \
xsrc/external/mit/xf86-video-cyrix/dist/src/cyrix_driver.c \
xsrc/external/mit/xf86-video-cyrix/dist/src/cyrix_helper.c \
xsrc/external/mit/xf86-video-cyrix/dist/src/cyrix_shadow.c

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



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-cyrix

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri May 28 02:37:27 UTC 2010

Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-cyrix: Makefile

Log Message:
obsolete xf86-video-cyrix


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-cyrix/Makefile

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



CVS commit: src/external/mit/xorg/server/drivers

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri May 28 02:35:47 UTC 2010

Added Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-via: Makefile

Log Message:
add build glue for xf86-video-geode and xf86-video-openchrome and
obsolete xf86-video-via.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.6 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-via/Makefile

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

Added files:

Index: src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.1
--- /dev/null	Fri May 28 02:35:47 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile	Fri May 28 02:35:46 2010
@@ -0,0 +1,49 @@
+#	$NetBSD: Makefile,v 1.1 2010/05/28 02:35:46 mrg Exp $
+
+DRIVER=		xf86-video-geode
+DRIVER_NAME=	geode_drv
+
+SRCS=	\
+	geode_driver.c \
+	geode_common.c \
+	geode_dcon.c \
+	geode_ddc.c \
+	geode_msr.c \
+	gx_driver.c\
+	gx_accel.c \
+	gx_cursor.c \
+	gx_video.c \
+	gx_regacc.c \
+	gx_rotate.c \
+	gx_randr.c \
+	durango.c \
+	panel.c \
+	lx_driver.c \
+	lx_cursor.c \
+	lx_memory.c \
+	lx_panel.c \
+	lx_output.c \
+	lx_display.c \
+	lx_video.c \
+	lx_exa.c \
+	cimarron.c
+NOMAN=	# defined
+
+CPPFLAGS+=	-DHAVE_GX -DHAVE_LX -DAMD_V4L2_VIDEO -DOPT_ACCEL -DPNL_SUP
+# This enables multi-mmap support; no idea why it is Linux 2.6 specific
+CPPFLAGS+=	-DLINUX_2_6
+
+CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/src/cim \
+		-I${X11SRCDIR.${DRIVER}}/src/gfx \
+		-I${X11SRCDIR.${DRIVER}}/src/panel
+
+CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
+
+# XXX ugh
+CPPFLAGS+=	-Doff64_t=off_t
+
+COPTS.gx_randr.c+=	-Wno-error	# XXX
+COPTS.lx_memory.c+=	-Wno-error	# XXX
+COPTS.panel.c+=		-Wno-error	# XXX -- huh? don't get this one
+
+.include "../Makefile.xf86-driver"

Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.1
--- /dev/null	Fri May 28 02:35:47 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile	Fri May 28 02:35:46 2010
@@ -0,0 +1,43 @@
+#	$NetBSD: Makefile,v 1.1 2010/05/28 02:35:46 mrg Exp $
+
+DRIVER=		xf86-video-openchrome
+DRIVER_NAME=	openchrome_drv
+
+SRCS=	\
+	via_3d.c \
+	via_accel.c \
+	via_bandwidth.c \
+	via_ch7xxx.c \
+	via_cursor.c \
+	via_crtc.c \
+	via_dga.c \
+	via_display.c \
+	via_driver.c \
+	via_i2c.c \
+	via_id.c \
+	via_lvds.c \
+	via_memcpy.c \
+	via_memory.c \
+	via_mode.c \
+	via_panel.c \
+	via_shadow.c \
+	via_swov.c \
+	via_timing.c \
+	via_vbe.c \
+	via_vgahw.c \
+	via_video.c \
+	via_vt162x.c
+
+# DRI
+SRCS+=	\
+	via_dri.c \
+	via_xvmc.c
+
+MAN=	openchrome.4
+
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/dri
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/src
+
+.include "../Makefile.xf86-driver"



CVS commit: xsrc/external/mit/xf86-video-via/dist

2010-05-27 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri May 28 02:30:52 UTC 2010

Removed Files:
xsrc/external/mit/xf86-video-via/dist: COPYING ChangeLog Makefile.am
Makefile.in aclocal.m4 config.guess config.h.in config.sub
configure configure.ac depcomp install-sh ltmain.sh missing
xsrc/external/mit/xf86-video-via/dist/man: Makefile.am Makefile.in
via.man
xsrc/external/mit/xf86-video-via/dist/src: Makefile.am Makefile.in
via.h via_3d.c via_3d.h via_accel.c via_bandwidth.c via_bios.h
via_cursor.c via_dga.c via_dmabuffer.h via_dri.c via_dri.h
via_driver.c via_driver.h via_drmclient.h via_i2c.c via_id.c
via_id.h via_memcpy.c via_memcpy.h via_memory.c via_mode.c
via_mode.h via_priv.h via_regs.h via_shadow.c via_swov.c via_swov.h
via_vbe.c via_vgahw.c via_vgahw.h via_video.c via_video.h
via_vt162x.c via_vt162x.h via_xvmc.c via_xvmc.h via_xvpriv.h
xsrc/external/mit/xf86-video-via/dist/src/xvmc: Makefile.am Makefile.in
driDrawable.c driDrawable.h viaLowLevel.c viaLowLevel.h
viaLowLevelPro.c viaXvMC.c viaXvMCPriv.h xf86dri.c xf86dri.h
xf86dristr.h

Log Message:
obsolete these old sources.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-via/dist/COPYING \
xsrc/external/mit/xf86-video-via/dist/ChangeLog \
xsrc/external/mit/xf86-video-via/dist/Makefile.am \
xsrc/external/mit/xf86-video-via/dist/Makefile.in \
xsrc/external/mit/xf86-video-via/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-via/dist/config.guess \
xsrc/external/mit/xf86-video-via/dist/config.h.in \
xsrc/external/mit/xf86-video-via/dist/config.sub \
xsrc/external/mit/xf86-video-via/dist/configure \
xsrc/external/mit/xf86-video-via/dist/configure.ac \
xsrc/external/mit/xf86-video-via/dist/depcomp \
xsrc/external/mit/xf86-video-via/dist/install-sh \
xsrc/external/mit/xf86-video-via/dist/ltmain.sh \
xsrc/external/mit/xf86-video-via/dist/missing
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-via/dist/man/Makefile.am \
xsrc/external/mit/xf86-video-via/dist/man/Makefile.in \
xsrc/external/mit/xf86-video-via/dist/man/via.man
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-via/dist/src/Makefile.am \
xsrc/external/mit/xf86-video-via/dist/src/Makefile.in \
xsrc/external/mit/xf86-video-via/dist/src/via.h \
xsrc/external/mit/xf86-video-via/dist/src/via_3d.c \
xsrc/external/mit/xf86-video-via/dist/src/via_3d.h \
xsrc/external/mit/xf86-video-via/dist/src/via_accel.c \
xsrc/external/mit/xf86-video-via/dist/src/via_bandwidth.c \
xsrc/external/mit/xf86-video-via/dist/src/via_bios.h \
xsrc/external/mit/xf86-video-via/dist/src/via_cursor.c \
xsrc/external/mit/xf86-video-via/dist/src/via_dga.c \
xsrc/external/mit/xf86-video-via/dist/src/via_dmabuffer.h \
xsrc/external/mit/xf86-video-via/dist/src/via_dri.c \
xsrc/external/mit/xf86-video-via/dist/src/via_dri.h \
xsrc/external/mit/xf86-video-via/dist/src/via_driver.c \
xsrc/external/mit/xf86-video-via/dist/src/via_driver.h \
xsrc/external/mit/xf86-video-via/dist/src/via_drmclient.h \
xsrc/external/mit/xf86-video-via/dist/src/via_i2c.c \
xsrc/external/mit/xf86-video-via/dist/src/via_id.c \
xsrc/external/mit/xf86-video-via/dist/src/via_id.h \
xsrc/external/mit/xf86-video-via/dist/src/via_memcpy.c \
xsrc/external/mit/xf86-video-via/dist/src/via_memcpy.h \
xsrc/external/mit/xf86-video-via/dist/src/via_memory.c \
xsrc/external/mit/xf86-video-via/dist/src/via_mode.c \
xsrc/external/mit/xf86-video-via/dist/src/via_mode.h \
xsrc/external/mit/xf86-video-via/dist/src/via_priv.h \
xsrc/external/mit/xf86-video-via/dist/src/via_regs.h \
xsrc/external/mit/xf86-video-via/dist/src/via_shadow.c \
xsrc/external/mit/xf86-video-via/dist/src/via_swov.c \
xsrc/external/mit/xf86-video-via/dist/src/via_swov.h \
xsrc/external/mit/xf86-video-via/dist/src/via_vbe.c \
xsrc/external/mit/xf86-video-via/dist/src/via_vgahw.c \
xsrc/external/mit/xf86-video-via/dist/src/via_vgahw.h \
xsrc/external/mit/xf86-video-via/dist/src/via_video.c \
xsrc/external/mit/xf86-video-via/dist/src/via_video.h \
xsrc/external/mit/xf86-video-via/dist/src/via_vt162x.c \
xsrc/external/mit/xf86-video-via/dist/src/via_vt162x.h \
xsrc/external/mit/xf86-video-via/dist/src/via_xvmc.c \
xsrc/external/mit/xf86-video-via/dist/src/via_xvmc.h \
xsrc/external/mit/xf86-video-via/dist/src/via_xvpriv.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-via/dist/src/xvmc/Makefile.am \
xsrc/external/mit/xf86-video-via/dist/src/xvmc/Makefile.in \
xsrc/external/mit/xf86-video-via/dist/src/xvmc/driDrawable.c \
xsrc/external/mit/xf86-video-via/dist/src/xvmc/driDrawable.h \
xsrc/external/mit/xf86-video-vi

CVS commit: xsrc/external/mit/xf86-video-geode/include

2010-05-27 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri May 28 02:29:33 UTC 2010

Added Files:
xsrc/external/mit/xf86-video-geode/include: config.h

Log Message:
geode wants a config.h.  give it one.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xf86-video-geode/include/config.h

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

Added files:

Index: xsrc/external/mit/xf86-video-geode/include/config.h
diff -u /dev/null xsrc/external/mit/xf86-video-geode/include/config.h:1.1
--- /dev/null	Fri May 28 02:29:33 2010
+++ xsrc/external/mit/xf86-video-geode/include/config.h	Fri May 28 02:29:33 2010
@@ -0,0 +1,89 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+#include "xorg-server.h"
+
+/* Define to 1 if you have the declaration of `amd64', and to 0 if you don't.
+   */
+/* #undef HAVE_DECL_AMD64 */
+
+/* Define to 1 if you have the declaration of `_LP64', and to 0 if you don't.
+   */
+/* #undef HAVE_DECL__LP64 */
+
+/* Define to 1 if you have the declaration of `__amd64__', and to 0 if you
+   don't. */
+/* #undef HAVE_DECL___AMD64__ */
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_UNISTD_H 1
+
+/* xextproto 7.1 available */
+#define HAVE_XEXTPROTO_71 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "xf86-video-geode"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2Fgeode";
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "xf86-video-geode"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "xf86-video-geode 2.11.8"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "xf86-video-geode"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "http://www.x.org/wiki/GeodeDriver";
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "2.11.8"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR 2
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR 11
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL 8
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "2.11.8"



CVS commit: src/sys/dev/pci

2010-05-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri May 28 02:24:27 UTC 2010

Modified Files:
src/sys/dev/pci: pci_verbose.h

Log Message:
Fix symbol name in multiple-inclusion protection. (missing trailing '_')


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/pci_verbose.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/pci_verbose.h
diff -u src/sys/dev/pci/pci_verbose.h:1.1 src/sys/dev/pci/pci_verbose.h:1.2
--- src/sys/dev/pci/pci_verbose.h:1.1	Thu May 27 05:53:35 2010
+++ src/sys/dev/pci/pci_verbose.h	Fri May 28 02:24:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_verbose.h,v 1.1 2010/05/27 05:53:35 pgoyette Exp $ */
+/*	$NetBSD: pci_verbose.h,v 1.2 2010/05/28 02:24:27 pgoyette Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #ifndef _DEV_PCI_PCIVERBOSE_H_
-#define	_DEV_PCI_PCIVERBOSE_H
+#define	_DEV_PCI_PCIVERBOSE_H_
 
 /*
  * Misc.
@@ -47,4 +47,4 @@
 extern const char *(*pci_findproduct)(pcireg_t);
 extern const char *pci_unmatched;
 
-#endif /* _DEV_PCI_PCIVERBOSE_H */
+#endif /* _DEV_PCI_PCIVERBOSE_H_ */



CVS commit: xsrc/external/mit/xf86-video-geode/dist

2010-05-27 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri May 28 01:01:14 UTC 2010

Update of /cvsroot/xsrc/external/mit/xf86-video-geode/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18344

Log Message:
initial import of xf86-video-geode-2.11.8

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-geode-2-11-8

N xsrc/external/mit/xf86-video-geode/dist/Makefile.in
N xsrc/external/mit/xf86-video-geode/dist/configure
N xsrc/external/mit/xf86-video-geode/dist/config.sub
N xsrc/external/mit/xf86-video-geode/dist/install-sh
N xsrc/external/mit/xf86-video-geode/dist/missing
N xsrc/external/mit/xf86-video-geode/dist/config.guess
N xsrc/external/mit/xf86-video-geode/dist/COPYING
N xsrc/external/mit/xf86-video-geode/dist/configure.ac
N xsrc/external/mit/xf86-video-geode/dist/Makefile.am
N xsrc/external/mit/xf86-video-geode/dist/INSTALL
N xsrc/external/mit/xf86-video-geode/dist/ChangeLog
N xsrc/external/mit/xf86-video-geode/dist/autogen.sh
N xsrc/external/mit/xf86-video-geode/dist/README
N xsrc/external/mit/xf86-video-geode/dist/depcomp
N xsrc/external/mit/xf86-video-geode/dist/ltmain.sh
N xsrc/external/mit/xf86-video-geode/dist/aclocal.m4
N xsrc/external/mit/xf86-video-geode/dist/config.h.in
N xsrc/external/mit/xf86-video-geode/dist/TODO
N xsrc/external/mit/xf86-video-geode/dist/src/geode_common.c
N xsrc/external/mit/xf86-video-geode/dist/src/gx_vga.c
N xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c
N xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c
N xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c
N xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c
N xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c
N xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c
N xsrc/external/mit/xf86-video-geode/dist/src/Makefile.in
N xsrc/external/mit/xf86-video-geode/dist/src/geode_blend.h
N xsrc/external/mit/xf86-video-geode/dist/src/geode_ddc.c
N xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c
N xsrc/external/mit/xf86-video-geode/dist/src/panel.c
N xsrc/external/mit/xf86-video-geode/dist/src/lx_memory.c
N xsrc/external/mit/xf86-video-geode/dist/src/geode_fourcc.h
N xsrc/external/mit/xf86-video-geode/dist/src/durango.c
N xsrc/external/mit/xf86-video-geode/dist/src/Makefile.am
N xsrc/external/mit/xf86-video-geode/dist/src/cim_dev.h
N xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c
N xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c
N xsrc/external/mit/xf86-video-geode/dist/src/lx_output.c
N xsrc/external/mit/xf86-video-geode/dist/src/geode_pcirename.h
N xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c
N xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
N xsrc/external/mit/xf86-video-geode/dist/src/gx_rotate.c
N xsrc/external/mit/xf86-video-geode/dist/src/lx_vga.c
N xsrc/external/mit/xf86-video-geode/dist/src/gx_regacc.c
N xsrc/external/mit/xf86-video-geode/dist/src/geode.h
N xsrc/external/mit/xf86-video-geode/dist/src/gx_cursor.c
N xsrc/external/mit/xf86-video-geode/dist/src/cimarron.c
N xsrc/external/mit/xf86-video-geode/dist/src/z4l.c
N xsrc/external/mit/xf86-video-geode/dist/src/lx_video.c
N xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_version.h
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_defs.h
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_init.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_regs.h
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_modes.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_filter.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vip.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vop.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_df.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_gp.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vg.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_parm.h
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_rtns.h
N xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_msr.c
N xsrc/external/mit/xf86-video-geode/dist/src/cim/doc/release.txt
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_mode.h
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/init_gu2.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/release.txt
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/tv_1200.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/vid_rdcl.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vid.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_rndr.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_priv.h
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vga.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/tv_fs450.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/disp_gu1.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vip.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_i2c.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_disp.c
N xsrc/external/mit/xf86-video-geode/dist/src/gfx/saa71

CVS commit: src/sys/kern

2010-05-27 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Thu May 27 23:58:38 UTC 2010

Modified Files:
src/sys/kern: vfs_subr.c

Log Message:
.. except we need to check the flag while still clinging to iLock.


To generate a diff of this commit:
cvs rdiff -u -r1.402 -r1.403 src/sys/kern/vfs_subr.c

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

Modified files:

Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.402 src/sys/kern/vfs_subr.c:1.403
--- src/sys/kern/vfs_subr.c:1.402	Thu May 27 23:54:35 2010
+++ src/sys/kern/vfs_subr.c	Thu May 27 23:58:38 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_subr.c,v 1.402 2010/05/27 23:54:35 pooka Exp $	*/
+/*	$NetBSD: vfs_subr.c,v 1.403 2010/05/27 23:58:38 pooka Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.402 2010/05/27 23:54:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.403 2010/05/27 23:58:38 pooka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -1335,6 +1335,11 @@
 			return ENOENT;
 		}
 	}
+
+	/*
+	 * Ok, we got it in good shape.  Just locking left.
+	 */
+	KASSERT((vp->v_iflag & VI_CLEAN) == 0);
 	if (flags & LK_TYPE_MASK) {
 		error = vn_lock(vp, flags | LK_INTERLOCK);
 		if (error != 0) {
@@ -1343,7 +1348,6 @@
 	} else {
 		mutex_exit(&vp->v_interlock);
 	}
-	KASSERT(error || (vp->v_iflag & VI_CLEAN) == 0);
 	return error;
 }
 



CVS commit: src/sys/kern

2010-05-27 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Thu May 27 23:54:35 UTC 2010

Modified Files:
src/sys/kern: vfs_subr.c

Log Message:
Assert that a VI_CLEAN vnode is not succesfully vget'd.


To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.402 src/sys/kern/vfs_subr.c

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

Modified files:

Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.401 src/sys/kern/vfs_subr.c:1.402
--- src/sys/kern/vfs_subr.c:1.401	Mon May 24 03:50:25 2010
+++ src/sys/kern/vfs_subr.c	Thu May 27 23:54:35 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_subr.c,v 1.401 2010/05/24 03:50:25 pgoyette Exp $	*/
+/*	$NetBSD: vfs_subr.c,v 1.402 2010/05/27 23:54:35 pooka Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.401 2010/05/24 03:50:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.402 2010/05/27 23:54:35 pooka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -1286,7 +1286,7 @@
 int
 vget(vnode_t *vp, int flags)
 {
-	int error;
+	int error = 0;
 
 	KASSERT((vp->v_iflag & VI_MARKER) == 0);
 
@@ -1340,10 +1340,11 @@
 		if (error != 0) {
 			vrele(vp);
 		}
-		return error;
+	} else {
+		mutex_exit(&vp->v_interlock);
 	}
-	mutex_exit(&vp->v_interlock);
-	return 0;
+	KASSERT(error || (vp->v_iflag & VI_CLEAN) == 0);
+	return error;
 }
 
 /*



CVS commit: src/sys/fs/sysvbfs

2010-05-27 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Thu May 27 23:40:12 UTC 2010

Modified Files:
src/sys/fs/sysvbfs: sysvbfs.h sysvbfs_vnops.c

Log Message:
Mark files removed in the in-memory structure.  This allows us
to do two things:

 1) properly set "recycle?" in inactive
 2) easily check if we are renaming a removed vnode.  without the
check, it was possible to enter a dirent in the file system for
a removed (and hence scheduled to be vcleaned) vnode.  this would
lead to the succesful vget() of a clean vnode.  the use of the
cleaned vnode was, however, less succesful, except for purposes
of crashing.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/fs/sysvbfs/sysvbfs.h
cvs rdiff -u -r1.29 -r1.30 src/sys/fs/sysvbfs/sysvbfs_vnops.c

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

Modified files:

Index: src/sys/fs/sysvbfs/sysvbfs.h
diff -u src/sys/fs/sysvbfs/sysvbfs.h:1.8 src/sys/fs/sysvbfs/sysvbfs.h:1.9
--- src/sys/fs/sysvbfs/sysvbfs.h:1.8	Thu Sep  4 12:07:30 2008
+++ src/sys/fs/sysvbfs/sysvbfs.h	Thu May 27 23:40:12 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysvbfs.h,v 1.8 2008/09/04 12:07:30 pooka Exp $	*/
+/*	$NetBSD: sysvbfs.h,v 1.9 2010/05/27 23:40:12 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -52,6 +52,7 @@
 	int update_ctime;
 	int update_atime;
 	int update_mtime;
+	int removed;
 
 	LIST_ENTRY(sysvbfs_node) link;
 };

Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.29 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.30
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.29	Thu May 27 13:22:02 2010
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c	Thu May 27 23:40:12 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysvbfs_vnops.c,v 1.29 2010/05/27 13:22:02 pooka Exp $	*/
+/*	$NetBSD: sysvbfs_vnops.c,v 1.30 2010/05/27 23:40:12 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.29 2010/05/27 13:22:02 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.30 2010/05/27 23:40:12 pooka Exp $");
 
 #include 
 #include 
@@ -481,6 +481,10 @@
 		vput(vp);
 	vput(dvp);
 
+	if (err == 0) {
+		bnode->removed = 1;
+	}
+
 	if (err || (ap->a_cnp->cn_flags & SAVESTART) == 0)
 		PNBUF_PUT(ap->a_cnp->cn_pnbuf);
 
@@ -518,11 +522,26 @@
 
 	KDASSERT(fvp->v_type == VREG);
 	KDASSERT(tvp == NULL ? true : tvp->v_type == VREG);
+	KASSERT(tdvp == fdvp);
+
+	/*
+	 * Make sure the source hasn't been removed between lookup
+	 * and target directory lock.
+	 */
+	if (bnode->removed) {
+		error = ENOENT;
+		goto out;
+	}
 
 	error = bfs_file_rename(bfs, from_name, to_name);
  out:
-	if (tvp)
+	if (tvp) {
+		if (error == 0) {
+			struct sysvbfs_node *tbnode = tvp->v_data;
+			tbnode->removed = 1;
+		}
 		vput(tvp);
+	}
 
 	/* tdvp == tvp probably can't happen with this fs, but safety first */
 	if (tdvp == tvp)
@@ -604,9 +623,13 @@
 		bool *a_recycle;
 	} */ *a = arg;
 	struct vnode *v = a->a_vp;
+	struct sysvbfs_node *bnode = v->v_data;
 
 	DPRINTF("%s:\n", __func__);
-	*a->a_recycle = true;
+	if (bnode->removed)
+		*a->a_recycle = true;
+	else
+		*a->a_recycle = false;
 	VOP_UNLOCK(v, 0);
 
 	return 0;



CVS commit: src/sys/dev/pci

2010-05-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu May 27 23:13:10 UTC 2010

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

Log Message:
Remove a left-over debugging call to aprint_normal()

Thanks njoly@


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/pci_verbose.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/pci_verbose.c
diff -u src/sys/dev/pci/pci_verbose.c:1.3 src/sys/dev/pci/pci_verbose.c:1.4
--- src/sys/dev/pci/pci_verbose.c:1.3	Thu May 27 05:53:35 2010
+++ src/sys/dev/pci/pci_verbose.c	Thu May 27 23:13:10 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_verbose.c,v 1.3 2010/05/27 05:53:35 pgoyette Exp $	*/
+/*	$NetBSD: pci_verbose.c,v 1.4 2010/05/27 23:13:10 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_verbose.c,v 1.3 2010/05/27 05:53:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_verbose.c,v 1.4 2010/05/27 23:13:10 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -78,7 +78,6 @@
 static int
 pciverbose_modcmd(modcmd_t cmd, void *arg)
 {
-	aprint_normal("%s: cmd %d\n", __func__, cmd);	/* XXX */
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		pci_findvendor = pci_findvendor_real;



CVS commit: src/share/man/man4

2010-05-27 Thread S.P.Zeidler
Module Name:src
Committed By:   spz
Date:   Thu May 27 19:27:24 UTC 2010

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

Log Message:
help the next person tripping over PR kern/43203 :
list the error messages, the reason for the error and the location where
the firmware ought to be


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

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

Modified files:

Index: src/share/man/man4/iwn.4
diff -u src/share/man/man4/iwn.4:1.7 src/share/man/man4/iwn.4:1.8
--- src/share/man/man4/iwn.4:1.7	Mon May 18 02:41:23 2009
+++ src/share/man/man4/iwn.4	Thu May 27 19:27:24 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: iwn.4,v 1.7 2009/05/18 02:41:23 snj Exp $
+.\" $NetBSD: iwn.4,v 1.8 2010/05/27 19:27:24 spz Exp $
 .\"
 .\" Copyright (c) 2007,2008
 .\"	Damien Bergamini . All rights reserved.
@@ -182,6 +182,11 @@
 For some reason, the driver was unable to read the firmware image from the
 filesystem.
 The file might be missing or corrupted.
+.It "iwn%d: could not get firmware handle %s"
+.It "iwn%d: could not read firmware"
+The driver was unable to find the file with the proper firmware image.
+It should be located in 
+.Pa /libdata/firmware/if_iwn .
 .It "iwn%d: firmware file too short: %d bytes"
 The firmware image is corrupted and can't be loaded into the adapter.
 .It "iwn%d: could not load firmware"



CVS commit: src/sys/arch/sandpoint

2010-05-27 Thread Frank Wille
Module Name:src
Committed By:   phx
Date:   Thu May 27 15:35:46 UTC 2010

Modified Files:
src/sys/arch/sandpoint: README.NAS

Log Message:
Added some more precise LinkStation/TeraStation and Synology product names.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/README.NAS

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/sandpoint/README.NAS
diff -u src/sys/arch/sandpoint/README.NAS:1.5 src/sys/arch/sandpoint/README.NAS:1.6
--- src/sys/arch/sandpoint/README.NAS:1.5	Sat May  8 18:48:44 2010
+++ src/sys/arch/sandpoint/README.NAS	Thu May 27 15:35:46 2010
@@ -1,4 +1,4 @@
-$NetBSD: README.NAS,v 1.5 2010/05/08 18:48:44 phx Exp $
+$NetBSD: README.NAS,v 1.6 2010/05/27 15:35:46 phx Exp $
 
  MPC8241/8245 NAS products 
 
@@ -6,13 +6,14 @@
 
 NIC	IDE		machine description
 			--
-tlp.11	cmdide.12	classic Kurobox
-re.11	cmdide.12	Kurobox HG
-re.11	iteide.12/13	classic TeraStation
-re.11	satalink.12/13	TeraStation Pro
-re.11	iteide.12	Gigabit LinkStation
-sk.15	iteide.13	Synology DS-106j/LinkStation LANxxxG
-sk.15	satalink.13	Synology DS-101g+/106e/106/207
+tlp.11	cmdide.12	classic KuroBox, LinkStation HD-HLAN(LS1)
+re.11	cmdide.12	KuroBox HG
+re.11	iteide.12	Gigabit LinkStation HD-HGLAN
+re.11	iteide.12/13	classic TeraStation HD-HTGL
+re.11	satalink.12/13	TeraStation Pro TS-TGL v1
+sk.15	iteide.13	Synology DS-106j, LinkStation LANxxxG
+sk.15	satalink.13	Synology DS-101g+/106e/106/106x/107e/107/207
+			DS-108j/109j/209j
 sk.15	satalink.12/13	Synology CS-406/RS-406/CS-406e/CS-407e
 wm.15	satalink.13 	QNAP TS-101/201
 re.15	viaide.13	IOMEGA StorCenter



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

2010-05-27 Thread Frank Wille
Module Name:src
Committed By:   phx
Date:   Thu May 27 14:54:42 UTC 2010

Modified Files:
src/sys/arch/sandpoint/pci: pci_machdep.c

Log Message:
Disable EPIC_DEBUGIRQ. Reenable when needed.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sandpoint/pci/pci_machdep.c

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

Modified files:

Index: src/sys/arch/sandpoint/pci/pci_machdep.c
diff -u src/sys/arch/sandpoint/pci/pci_machdep.c:1.17 src/sys/arch/sandpoint/pci/pci_machdep.c:1.18
--- src/sys/arch/sandpoint/pci/pci_machdep.c:1.17	Thu Jul 30 05:57:27 2009
+++ src/sys/arch/sandpoint/pci/pci_machdep.c	Thu May 27 14:54:42 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.17 2009/07/30 05:57:27 nisimura Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.18 2010/05/27 14:54:42 phx Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.17 2009/07/30 05:57:27 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.18 2010/05/27 14:54:42 phx Exp $");
 
 #include "opt_pci.h"
 
@@ -87,7 +87,7 @@
 	_bus_dmamem_mmap,
 };
 
-#define	EPIC_DEBUGIRQ
+/*#define EPIC_DEBUGIRQ*/
 
 static int brdtype;
 #define BRD_SANDPOINTX2		2
@@ -241,7 +241,7 @@
 		goto bad;
 	}
 #ifdef EPIC_DEBUGIRQ
-printf("line %d, pin %c", line, pin + '@');
+	printf("line %d, pin %c", line, pin + '@');
 #endif
 	switch (brdtype) {
 	/* Sandpoint has 4 PCI slots in a weird order.
@@ -335,7 +335,7 @@
 		break;
 	}
 #ifdef EPIC_DEBUGIRQ
-printf(" = EPIC %d\n", *ihp);
+	printf(" = EPIC %d\n", *ihp);
 #endif
 	return 0;
   bad:



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

2010-05-27 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Thu May 27 14:47:31 UTC 2010

Modified Files:
src/sys/arch/alpha/alpha [uebayasi-xip]: machdep.c
src/sys/arch/atari/atari [uebayasi-xip]: bus.c
src/sys/arch/landisk/landisk [uebayasi-xip]: bus_dma.c
src/sys/arch/mips/mips [uebayasi-xip]: mips_machdep.c
src/sys/arch/powerpc/oea [uebayasi-xip]: cpu_subr.c
src/sys/arch/powerpc/powerpc [uebayasi-xip]: bus_dma.c pmap_subr.c
src/sys/arch/sh3/sh3 [uebayasi-xip]: mem.c sh3_machdep.c
src/sys/arch/sparc/sparc [uebayasi-xip]: db_interface.c
src/sys/arch/sparc64/dev [uebayasi-xip]: iommu.c
src/sys/arch/sparc64/sparc64 [uebayasi-xip]: cpu.c db_interface.c
src/sys/arch/vax/include [uebayasi-xip]: db_machdep.h pmap.h
src/sys/arch/vax/vax [uebayasi-xip]: pmap.c

Log Message:
Fix build.


To generate a diff of this commit:
cvs rdiff -u -r1.325.2.2 -r1.325.2.3 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.51.2.1 -r1.51.2.2 src/sys/arch/atari/atari/bus.c
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/arch/landisk/landisk/bus_dma.c
cvs rdiff -u -r1.225.2.2 -r1.225.2.3 src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.54.2.1 -r1.54.2.2 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.35.2.1 -r1.35.2.2 src/sys/arch/powerpc/powerpc/bus_dma.c
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/sys/arch/powerpc/powerpc/pmap_subr.c
cvs rdiff -u -r1.26.64.1 -r1.26.64.2 src/sys/arch/sh3/sh3/mem.c
cvs rdiff -u -r1.85.2.1 -r1.85.2.2 src/sys/arch/sh3/sh3/sh3_machdep.c
cvs rdiff -u -r1.86 -r1.86.2.1 src/sys/arch/sparc/sparc/db_interface.c
cvs rdiff -u -r1.96.2.1 -r1.96.2.2 src/sys/arch/sparc64/dev/iommu.c
cvs rdiff -u -r1.88.2.1 -r1.88.2.2 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.121.2.1 -r1.121.2.2 \
src/sys/arch/sparc64/sparc64/db_interface.c
cvs rdiff -u -r1.16 -r1.16.14.1 src/sys/arch/vax/include/db_machdep.h
cvs rdiff -u -r1.77 -r1.77.2.1 src/sys/arch/vax/include/pmap.h
cvs rdiff -u -r1.175.2.1 -r1.175.2.2 src/sys/arch/vax/vax/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/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.325.2.2 src/sys/arch/alpha/alpha/machdep.c:1.325.2.3
--- src/sys/arch/alpha/alpha/machdep.c:1.325.2.2	Fri Apr 30 14:39:02 2010
+++ src/sys/arch/alpha/alpha/machdep.c	Thu May 27 14:47:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.325.2.2 2010/04/30 14:39:02 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.325.2.3 2010/05/27 14:47:28 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.325.2.2 2010/04/30 14:39:02 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.325.2.3 2010/05/27 14:47:28 uebayasi Exp $");
 
 #include 
 #include 
@@ -105,7 +105,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 #include 

Index: src/sys/arch/atari/atari/bus.c
diff -u src/sys/arch/atari/atari/bus.c:1.51.2.1 src/sys/arch/atari/atari/bus.c:1.51.2.2
--- src/sys/arch/atari/atari/bus.c:1.51.2.1	Fri Apr 30 14:39:09 2010
+++ src/sys/arch/atari/atari/bus.c	Thu May 27 14:47:29 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.c,v 1.51.2.1 2010/04/30 14:39:09 uebayasi Exp $	*/
+/*	$NetBSD: bus.c,v 1.51.2.2 2010/05/27 14:47:29 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.51.2.1 2010/04/30 14:39:09 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.51.2.2 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include 
 #include 
@@ -40,7 +40,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include 
 #include 

Index: src/sys/arch/landisk/landisk/bus_dma.c
diff -u src/sys/arch/landisk/landisk/bus_dma.c:1.8.2.1 src/sys/arch/landisk/landisk/bus_dma.c:1.8.2.2
--- src/sys/arch/landisk/landisk/bus_dma.c:1.8.2.1	Fri Apr 30 14:39:32 2010
+++ src/sys/arch/landisk/landisk/bus_dma.c	Thu May 27 14:47:29 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.8.2.1 2010/04/30 14:39:32 uebayasi Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.8.2.2 2010/05/27 14:47:29 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2005 NONAKA Kimihiro
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.8.2.1 2010/04/30 14:39:32 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.8.2.2 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include 
 #include 
@@ -35,7 +35,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include 
 

Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.225.2.2 src/sys/arch/mips/mips/mips_machdep.c:1.225.2.3
--- src/sys/arch/mips/mips/mips_machdep.c:1.225.2.2	Fri Apr 30 14:39:36 2010
+++ src/sys/arch/mips/mips/mips_machdep.c	Thu May 27 14:47:29 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_machdep.c,v 1.225.

CVS commit: src/sys/fs/sysvbfs

2010-05-27 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Thu May 27 13:22:03 UTC 2010

Modified Files:
src/sys/fs/sysvbfs: sysvbfs_vnops.c

Log Message:
Release pathname buffers after use.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/fs/sysvbfs/sysvbfs_vnops.c

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

Modified files:

Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.28 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.29
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.28	Wed May 26 21:27:00 2010
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c	Thu May 27 13:22:02 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysvbfs_vnops.c,v 1.28 2010/05/26 21:27:00 pooka Exp $	*/
+/*	$NetBSD: sysvbfs_vnops.c,v 1.29 2010/05/27 13:22:02 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.28 2010/05/26 21:27:00 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.29 2010/05/27 13:22:02 pooka Exp $");
 
 #include 
 #include 
@@ -168,6 +168,9 @@
 	/* unlock parent directory */
 	vput(a->a_dvp);	/* locked at sysvbfs_lookup(); */
 
+	if (err || (a->a_cnp->cn_flags & SAVESTART) == 0)
+		PNBUF_PUT(a->a_cnp->cn_pnbuf);
+
 	return err;
 }
 
@@ -478,6 +481,9 @@
 		vput(vp);
 	vput(dvp);
 
+	if (err || (ap->a_cnp->cn_flags & SAVESTART) == 0)
+		PNBUF_PUT(ap->a_cnp->cn_pnbuf);
+
 	return err;
 }
 



CVS commit: src/usr.bin/seq

2010-05-27 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Thu May 27 08:40:20 UTC 2010

Modified Files:
src/usr.bin/seq: seq.c

Log Message:
Rerun valid_format() both before and after unescaping the format
string, in case the format string contains printf conversions
assembled from escape sequences.

A better approach might be to adjust the unescape logic to avoid
generating printf conversions (e.g. convert \x25 to %% instead of %)
but that's somewhat problematic and it's not really worth taking the
trouble.

Running valid_format() only after unescaping would also be somewhat
tidier but makes printing the invalid format string problematic,
because the unescape logic runs in place.

None of these cases are really worth worrying about in detail, but now
at least they don't result in SIGSEGV.

Related to PR 43355.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/seq/seq.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/seq/seq.c
diff -u src/usr.bin/seq/seq.c:1.6 src/usr.bin/seq/seq.c:1.7
--- src/usr.bin/seq/seq.c:1.6	Thu May 27 08:30:35 2010
+++ src/usr.bin/seq/seq.c	Thu May 27 08:40:19 2010
@@ -31,7 +31,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2005\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: seq.c,v 1.6 2010/05/27 08:30:35 dholland Exp $");
+__RCSID("$NetBSD: seq.c,v 1.7 2010/05/27 08:40:19 dholland Exp $");
 #endif /* not lint */
 
 #include 
@@ -162,6 +162,8 @@
 		if (!valid_format(fmt))
 			errx(1, "invalid format string: `%s'", fmt);
 		fmt = unescape(fmt);
+		if (!valid_format(fmt))
+			errx(1, "invalid format string");
 		/*
 	 * XXX to be bug for bug compatible with Plan 9 add a
 		 * newline if none found at the end of the format string.



CVS commit: src/usr.bin/seq

2010-05-27 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Thu May 27 08:30:35 UTC 2010

Modified Files:
src/usr.bin/seq: seq.1 seq.c

Log Message:
Fix valid_format() to be more careful about allowing only valid printf
formats.

Also, accept %a and %A, which are new since this logic was last updated,
and also allow %F even though it's not functionally different from %f.
Document these additions and bump date of man page.

Fixes PR 43355.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/seq/seq.1
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/seq/seq.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/seq/seq.1
diff -u src/usr.bin/seq/seq.1:1.6 src/usr.bin/seq/seq.1:1.7
--- src/usr.bin/seq/seq.1:1.6	Wed Nov 26 15:03:47 2008
+++ src/usr.bin/seq/seq.1	Thu May 27 08:30:35 2010
@@ -1,4 +1,4 @@
-.\"	$NetBSD: seq.1,v 1.6 2008/11/26 15:03:47 ginsbach Exp $
+.\"	$NetBSD: seq.1,v 1.7 2010/05/27 08:30:35 dholland Exp $
 .\"
 .\" Copyright (c) 2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd January 17, 2005
+.Dd May 27, 2010
 .Dt SEQ 1
 .Os
 .Sh NAME
@@ -78,8 +78,11 @@
 .Ar format
 to print each number.
 Only the
+.Cm A ,
+.Cm a ,
 .Cm E ,
 .Cm e ,
+.Cm F ,
 .Cm f ,
 .Cm G ,
 .Cm g ,

Index: src/usr.bin/seq/seq.c
diff -u src/usr.bin/seq/seq.c:1.5 src/usr.bin/seq/seq.c:1.6
--- src/usr.bin/seq/seq.c:1.5	Mon Jul 21 14:19:26 2008
+++ src/usr.bin/seq/seq.c	Thu May 27 08:30:35 2010
@@ -31,7 +31,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2005\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: seq.c,v 1.5 2008/07/21 14:19:26 lukem Exp $");
+__RCSID("$NetBSD: seq.c,v 1.6 2010/05/27 08:30:35 dholland Exp $");
 #endif /* not lint */
 
 #include 
@@ -228,39 +228,56 @@
 int
 valid_format(const char *fmt)
 {
-	int conversions = 0;
+	unsigned conversions = 0;
 
 	while (*fmt != '\0') {
 		/* scan for conversions */
-		if (*fmt != '\0' && *fmt != '%') {
-			do {
-fmt++;
-			} while (*fmt != '\0' && *fmt != '%');
+		if (*fmt != '%') {
+			fmt++;
+			continue;
 		}
-		/* scan a conversion */
-		if (*fmt != '\0') {
-			do {
-fmt++;
+		fmt++;
 
-/* ok %% */
-if (*fmt == '%') {
-	fmt++;
-	break;
-}
-/* valid conversions */
-if (strchr("eEfgG", *fmt) &&
-conversions++ < 1) {
-	fmt++;
-	break;
-}
-/* flags, width and precsision */
-if (isdigit((unsigned char)*fmt) ||
-strchr("+- 0#.", *fmt))
-	continue;
+		/* allow %% but not things like %10% */
+		if (*fmt == '%') {
+			fmt++;
+			continue;
+		}
 
-/* oops! bad conversion format! */
-return (0);
-			} while (*fmt != '\0');
+		/* flags */
+		while (*fmt != '\0' && strchr("#0- +'", *fmt)) {
+			fmt++;
+		}
+
+		/* field width */
+		while (*fmt != '\0' && strchr("0123456789", *fmt)) {
+			fmt++;
+		}
+
+		/* precision */
+		if (*fmt == '.') {
+			fmt++;
+			while (*fmt != '\0' && strchr("0123456789", *fmt)) {
+fmt++;
+			}
+		}
+
+		/* conversion */
+		switch (*fmt) {
+		case 'A':
+		case 'a':
+		case 'E':
+		case 'e':
+		case 'F':
+		case 'f':
+		case 'G':
+		case 'g':
+			/* floating point formats are accepted */
+			conversions++;
+			break;
+		default:
+			/* anything else is not */
+			return 0;
 		}
 	}
 



CVS commit: xsrc/external/mit/xf86-video-openchrome/dist

2010-05-27 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Thu May 27 07:32:05 UTC 2010

Update of /cvsroot/xsrc/external/mit/xf86-video-openchrome/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv21052

Log Message:
initial import of xf86-video-openchrome-0.2.904

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-openchrome-0-2-904

N xsrc/external/mit/xf86-video-openchrome/dist/COPYING
N xsrc/external/mit/xf86-video-openchrome/dist/config.h.in
N xsrc/external/mit/xf86-video-openchrome/dist/config.guess
N xsrc/external/mit/xf86-video-openchrome/dist/Makefile.am
N xsrc/external/mit/xf86-video-openchrome/dist/configure
N xsrc/external/mit/xf86-video-openchrome/dist/README
N xsrc/external/mit/xf86-video-openchrome/dist/missing
N xsrc/external/mit/xf86-video-openchrome/dist/install-sh
N xsrc/external/mit/xf86-video-openchrome/dist/ChangeLog
N xsrc/external/mit/xf86-video-openchrome/dist/ltmain.sh
N xsrc/external/mit/xf86-video-openchrome/dist/NEWS
N xsrc/external/mit/xf86-video-openchrome/dist/config.sub
N xsrc/external/mit/xf86-video-openchrome/dist/acinclude.m4
N xsrc/external/mit/xf86-video-openchrome/dist/aclocal.m4
N xsrc/external/mit/xf86-video-openchrome/dist/depcomp
N xsrc/external/mit/xf86-video-openchrome/dist/Makefile.in
N xsrc/external/mit/xf86-video-openchrome/dist/configure.ac
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_bandwidth.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/svnversion.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_dmabuffer.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_ch7xxx.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_3d_reg.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_memory.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_drmclient.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/Makefile.am
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_vgahw.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_swov.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_dri.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_vt162x.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_xvmc.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_memcpy.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_vbe.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_xvmc.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_3d.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_swov.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_lvds.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_xvpriv.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_mode.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_panel.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_dri.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_bios.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_shadow.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_vt162x.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_vgahw.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_priv.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_regs.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_memcpy.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_timing.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_i2c.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_cursor.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_id.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_dga.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_mode.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_timing.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_ch7xxx.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_id.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_3d.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.h
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_crtc.c
N xsrc/external/mit/xf86-video-openchrome/dist/src/Makefile.in
N xsrc/external/mit/xf86-video-openchrome/dist/src/via_accel.c
N xsrc/external/mit/xf86-video-openchrome/dist/man/openchrome.man
N xsrc/external/mit/xf86-video-openchrome/dist/man/Makefile.am
N xsrc/external/mit/xf86-video-openchrome/dist/man/Makefile.in
N xsrc/external/mit/xf86-video-openchrome/dist/libxvmc/driDrawable.h
N xsrc/external/mit/xf86-video-openchrome/dist/libxvmc/xf86dri.c
N xsrc/external/mit/xf86-video-openchrome/dist/libxvmc/viaLowLevel.h
N xsrc/external/mit/xf86-video-openchrome/dist/libxvmc/Makefile.am
N xsrc/external/mit/xf86-video-openchrome/dist/libxvmc/viaLowLevelPro.c
N xsrc/external/mit/xf86-video-openchrome/dist/libxvmc/x

CVS commit: src/sys/modules/radeondrm

2010-05-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu May 27 07:27:35 UTC 2010

Modified Files:
src/sys/modules/radeondrm: Makefile

Log Message:
add r600_blit.c and radeon_cs.c.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/radeondrm/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/modules/radeondrm/Makefile
diff -u src/sys/modules/radeondrm/Makefile:1.7 src/sys/modules/radeondrm/Makefile:1.8
--- src/sys/modules/radeondrm/Makefile:1.7	Mon Jun 22 15:34:54 2009
+++ src/sys/modules/radeondrm/Makefile	Thu May 27 07:27:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/22 15:34:54 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/05/27 07:27:35 mrg Exp $
 
 .include "../Makefile.inc"
 
@@ -12,7 +12,9 @@
 SRCS+=	ati_pcigart.c
 SRCS+=	r300_cmdbuf.c
 SRCS+=	r600_cp.c
+SRCS+=	r600_blit.c
 SRCS+=	radeon_cp.c
+SRCS+=	radeon_cs.c
 SRCS+=	radeon_irq.c
 SRCS+=	radeon_mem.c
 SRCS+=	radeon_state.c