CVS commit: src/sys/dev

2012-05-29 Thread Roland Dowdeswell
Module Name:src
Committed By:   elric
Date:   Tue May 29 10:20:34 UTC 2012

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

Log Message:
Fix 32/64 bit int truncation issue.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.44 src/sys/dev/dksubr.c:1.45
--- src/sys/dev/dksubr.c:1.44	Fri May 25 14:25:39 2012
+++ src/sys/dev/dksubr.c	Tue May 29 10:20:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.44 2012/05/25 14:25:39 elric Exp $ */
+/* $NetBSD: dksubr.c,v 1.45 2012/05/29 10:20:33 elric Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.44 2012/05/25 14:25:39 elric Exp $);
+__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.45 2012/05/29 10:20:33 elric Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -635,9 +635,7 @@ dk_set_properties(struct dk_intf *di, st
 
 	geom = prop_dictionary_create();
 
-	prop_dictionary_set_uint64(geom, sectors-per-unit,
-	dksc-sc_geom.pdg_nsectors * dksc-sc_geom.pdg_ntracks *
-	dksc-sc_geom.pdg_ncylinders);
+	prop_dictionary_set_uint64(geom, sectors-per-unit, dksc-sc_size);
 
 	prop_dictionary_set_uint32(geom, sector-size,
 	dksc-sc_geom.pdg_secsize);



CVS commit: src/sys/dev/usb

2012-05-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 29 14:04:49 UTC 2012

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
more usb network adapters from jmcneill


To generate a diff of this commit:
cvs rdiff -u -r1.616 -r1.617 src/sys/dev/usb/usbdevs

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

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.616 src/sys/dev/usb/usbdevs:1.617
--- src/sys/dev/usb/usbdevs:1.616	Thu May 24 17:32:35 2012
+++ src/sys/dev/usb/usbdevs	Tue May 29 10:04:48 2012
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.616 2012/05/24 21:32:35 buhrow Exp $
+$NetBSD: usbdevs,v 1.617 2012/05/29 14:04:48 christos Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -832,6 +832,7 @@ product ASIX AX88772A		0x772a	AX88772A U
 product ASUSTEK WL167G		0x1707	WL-167g USB2.0 WLAN Adapter
 product ASUSTEK WL159G		0x170c	WL-159g
 product ASUSTEK A9T_WIFI	0x171b	A9T wireless
+product ASUSTEK P5B_WIFI	0x171d	P5B wireless
 product ASUSTEK WL167G_2	0x1723	WL-167g USB2.0 WLAN Adapter (version 2)
 product ASUSTEK WL167G_3	0x1724	WL-167g USB2.0 WLAN Adapter (version 2)
 product ASUSTEK RT2870_1	0x1731	RT2870
@@ -928,6 +929,7 @@ product BELKIN F5D7050		0x7050	F5D7050 5
 product BELKIN F5D7051		0x7051	F5D7051 54g USB Network Adapter
 product BELKIN F5D7050A		0x705a	F5D705A 54g USB Network Adapter
 product BELKIN F5D7050C		0x705c	F5D705C 54g USB Network Adapter
+product BELKIN F5D7050E		0x705c	F5D705E 54g USB Network Adapter
 product BELKIN RT2870_1		0x8053	RT2870
 product BELKIN RT2870_2		0x805c	RT2870
 product BELKIN F5D8053V3	0x815c	F5D8053 v3
@@ -1767,6 +1769,7 @@ product LINKSYS3 WUSB11V28	0x2233	WUSB11
 product LINKSYS4 USB1000	0x0039	USB1000
 product LINKSYS4 WUSB100	0x0070	WUSB100
 product LINKSYS4 WUSB600N	0x0071	WUSB600N
+product LINKSYS4 WUSB54GC_2	0x0073	WUSB54GC v2
 product LINKSYS4 WUSB54GC_3	0x0077	WUSB54GC v3
 
 /* Logitec products */
@@ -2615,7 +2618,9 @@ product SITECOM LN029		0x182d	LN029
 product SITECOM CN104		0x2068	CN104 serial
 
 /* Sitecom Europe products */
+product SITECOMEU WL168V1	0x000d	WL-168 v1
 product SITECOMEU RT2870_1	0x0017	RT2870
+product SITECOMEU WL168V4	0x0028	WL-168 v4
 product SITECOMEU RT2870_2	0x002b	RT2870
 product SITECOMEU RT2870_3	0x002c	RT2870
 product SITECOMEU RT2870_4	0x002d	RT2870



CVS commit: src/sys/dev/usb

2012-05-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 29 14:05:01 UTC 2012

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.608 -r1.609 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.609 -r1.610 src/sys/dev/usb/usbdevs_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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.608 src/sys/dev/usb/usbdevs.h:1.609
--- src/sys/dev/usb/usbdevs.h:1.608	Fri May 25 12:29:37 2012
+++ src/sys/dev/usb/usbdevs.h	Tue May 29 10:05:01 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.608 2012/05/25 16:29:37 buhrow Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.609 2012/05/29 14:05:01 christos Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.616 2012/05/24 21:32:35 buhrow Exp
+ *	NetBSD: usbdevs,v 1.617 2012/05/29 14:04:48 christos Exp
  */
 
 /*
@@ -839,6 +839,7 @@
 #define	USB_PRODUCT_ASUSTEK_WL167G	0x1707		/* WL-167g USB2.0 WLAN Adapter */
 #define	USB_PRODUCT_ASUSTEK_WL159G	0x170c		/* WL-159g */
 #define	USB_PRODUCT_ASUSTEK_A9T_WIFI	0x171b		/* A9T wireless */
+#define	USB_PRODUCT_ASUSTEK_P5B_WIFI	0x171d		/* P5B wireless */
 #define	USB_PRODUCT_ASUSTEK_WL167G_2	0x1723		/* WL-167g USB2.0 WLAN Adapter (version 2) */
 #define	USB_PRODUCT_ASUSTEK_WL167G_3	0x1724		/* WL-167g USB2.0 WLAN Adapter (version 2) */
 #define	USB_PRODUCT_ASUSTEK_RT2870_1	0x1731		/* RT2870 */
@@ -935,6 +936,7 @@
 #define	USB_PRODUCT_BELKIN_F5D7051	0x7051		/* F5D7051 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050A	0x705a		/* F5D705A 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050C	0x705c		/* F5D705C 54g USB Network Adapter */
+#define	USB_PRODUCT_BELKIN_F5D7050E	0x705c		/* F5D705E 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_RT2870_1	0x8053		/* RT2870 */
 #define	USB_PRODUCT_BELKIN_RT2870_2	0x805c		/* RT2870 */
 #define	USB_PRODUCT_BELKIN_F5D8053V3	0x815c		/* F5D8053 v3 */
@@ -1774,6 +1776,7 @@
 #define	USB_PRODUCT_LINKSYS4_USB1000	0x0039		/* USB1000 */
 #define	USB_PRODUCT_LINKSYS4_WUSB100	0x0070		/* WUSB100 */
 #define	USB_PRODUCT_LINKSYS4_WUSB600N	0x0071		/* WUSB600N */
+#define	USB_PRODUCT_LINKSYS4_WUSB54GC_2	0x0073		/* WUSB54GC v2 */
 #define	USB_PRODUCT_LINKSYS4_WUSB54GC_3	0x0077		/* WUSB54GC v3 */
 
 /* Logitec products */
@@ -2622,7 +2625,9 @@
 #define	USB_PRODUCT_SITECOM_CN104	0x2068		/* CN104 serial */
 
 /* Sitecom Europe products */
+#define	USB_PRODUCT_SITECOMEU_WL168V1	0x000d		/* WL-168 v1 */
 #define	USB_PRODUCT_SITECOMEU_RT2870_1	0x0017		/* RT2870 */
+#define	USB_PRODUCT_SITECOMEU_WL168V4	0x0028		/* WL-168 v4 */
 #define	USB_PRODUCT_SITECOMEU_RT2870_2	0x002b		/* RT2870 */
 #define	USB_PRODUCT_SITECOMEU_RT2870_3	0x002c		/* RT2870 */
 #define	USB_PRODUCT_SITECOMEU_RT2870_4	0x002d		/* RT2870 */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.609 src/sys/dev/usb/usbdevs_data.h:1.610
--- src/sys/dev/usb/usbdevs_data.h:1.609	Fri May 25 12:29:37 2012
+++ src/sys/dev/usb/usbdevs_data.h	Tue May 29 10:05:01 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.609 2012/05/25 16:29:37 buhrow Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.610 2012/05/29 14:05:01 christos Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.616 2012/05/24 21:32:35 buhrow Exp
+ *	NetBSD: usbdevs,v 1.617 2012/05/29 14:04:48 christos Exp
  */
 
 /*
@@ -2787,6 +2787,10 @@ const struct usb_product usb_products[] 
 	A9T wireless,
 	},
 	{
+	USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_P5B_WIFI,
+	P5B wireless,
+	},
+	{
 	USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL167G_2,
 	WL-167g USB2.0 WLAN Adapter (version 2),
 	},
@@ -3055,6 +3059,10 @@ const struct usb_product usb_products[] 
 	F5D705C 54g USB Network Adapter,
 	},
 	{
+	USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050E,
+	F5D705E 54g USB Network Adapter,
+	},
+	{
 	USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RT2870_1,
 	RT2870,
 	},
@@ -5387,6 +5395,10 @@ const struct usb_product usb_products[] 
 	WUSB600N,
 	},
 	{
+	USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GC_2,
+	WUSB54GC v2,
+	},
+	{
 	USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GC_3,
 	WUSB54GC v3,
 	},
@@ -7843,10 +7855,18 @@ const struct usb_product usb_products[] 
 	CN104 serial,
 	},
 	{
+	USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL168V1,
+	WL-168 v1,
+	},
+	{
 	USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_1,
 	RT2870,
 	},
 	{
+	USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL168V4,
+	WL-168 v4,
+	},
+	{
 	USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_2,
 	RT2870,
 	},
@@ -8875,4 +8895,4 @@ const struct usb_product usb_products[] 
 	Prestige,
 	},
 };
-const int usb_nproducts = 1704;
+const int usb_nproducts = 

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

2012-05-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 29 14:12:28 UTC 2012

Modified Files:
src/sys/arch/evbmips/conf: LOONGSON

Log Message:
add the realtek usb driver from jmcneill


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbmips/conf/LOONGSON

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/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.9 src/sys/arch/evbmips/conf/LOONGSON:1.10
--- src/sys/arch/evbmips/conf/LOONGSON:1.9	Fri Mar  2 08:20:57 2012
+++ src/sys/arch/evbmips/conf/LOONGSON	Tue May 29 10:12:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.9 2012/03/02 13:20:57 nonaka Exp $
+# $NetBSD: LOONGSON,v 1.10 2012/05/29 14:12:28 christos Exp $
 #
 # LOONGSON machine description file
 # 
@@ -22,7 +22,7 @@ include		arch/evbmips/conf/std.loongson
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		LOONGSON-$Revision: 1.9 $
+#ident 		LOONGSON-$Revision: 1.10 $
 
 maxusers	16
 
@@ -285,6 +285,9 @@ ucom*	at uplcom? portno ?
 umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
 ucom*	at umct? portno ?
 
+# Realtek RTL8187/RTL8187B 802.11b/g USB wireless adapter
+urtw*	at uhub? port ?
+
 # USB Generic driver
 ugen*	at uhub? port ?
 



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

2012-05-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue May 29 15:42:42 UTC 2012

Modified Files:
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el

Log Message:
Add n64/o32 versions of libexecinfo


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/base/ad.mips64el

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/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.90 src/distrib/sets/lists/base/ad.mips64eb:1.91
--- src/distrib/sets/lists/base/ad.mips64eb:1.90	Wed May  2 02:43:00 2012
+++ src/distrib/sets/lists/base/ad.mips64eb	Tue May 29 15:42:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.90 2012/05/02 02:43:00 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.91 2012/05/29 15:42:42 martin Exp $
 ./libexec/ld.elf_so-64base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32base-sysutil-bin	compat,pic
 ./usr/lib/64	base-compat-lib
@@ -63,6 +63,8 @@
 ./usr/lib/64/libbluetooth.so.4.2		base-compat-shlib	compat,pic
 ./usr/lib/64/libbsdmalloc.so.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libbsdmalloc.so.0.0		base-compat-shlib	compat,pic
+./usr/lib/64/libexecinfo.so.0			base-compat-shlib	compat,pic
+./usr/lib/64/libexecinfo.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libbz2.so.1			base-compat-shlib	compat,pic
 ./usr/lib/64/libbz2.so.1.1			base-compat-shlib	compat,pic
 ./usr/lib/64/libc.so.12base-compat-shlib	compat,pic
@@ -568,6 +570,8 @@
 ./usr/lib/o32/libwind.so.0.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libwrap.so.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/libwrap.so.1.0			base-compat-shlib	compat,pic
+./usr/lib/o32/libexecinfo.so.0			base-compat-shlib	compat,pic
+./usr/lib/o32/libexecinfo.so.0.0		base-compat-shlib	compat,pic
 ./usr/lib/o32/libz.so.1base-compat-shlib	compat,pic
 ./usr/lib/o32/libz.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/luabase-compat-shlib	compat

Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.89 src/distrib/sets/lists/base/ad.mips64el:1.90
--- src/distrib/sets/lists/base/ad.mips64el:1.89	Wed May  2 02:43:00 2012
+++ src/distrib/sets/lists/base/ad.mips64el	Tue May 29 15:42:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.89 2012/05/02 02:43:00 christos Exp $
+# $NetBSD: ad.mips64el,v 1.90 2012/05/29 15:42:42 martin Exp $
 ./libexec/ld.elf_so-64base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32base-sysutil-bin	compat,pic
 ./usr/lib/64	base-compat-lib
@@ -270,6 +270,8 @@
 ./usr/lib/64/libwind.so.0.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/64/libwrap.so.1			base-compat-shlib	compat,pic
 ./usr/lib/64/libwrap.so.1.0			base-compat-shlib	compat,pic
+./usr/lib/64/libexecinfo.so.0			base-compat-shlib	compat,pic
+./usr/lib/64/libexecinfo.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libz.so.1base-compat-shlib	compat,pic
 ./usr/lib/64/libz.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/64/luabase-compat-shlib	compat
@@ -568,6 +570,8 @@
 ./usr/lib/o32/libwind.so.0.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libwrap.so.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/libwrap.so.1.0			base-compat-shlib	compat,pic
+./usr/lib/o32/libexecinfo.so.0			base-compat-shlib	compat,pic
+./usr/lib/o32/libexecinfo.so.0.0		base-compat-shlib	compat,pic
 ./usr/lib/o32/libz.so.1base-compat-shlib	compat,pic
 ./usr/lib/o32/libz.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/luabase-compat-shlib	compat



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

2012-05-29 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Tue May 29 17:25:38 UTC 2012

Modified Files:
src/sys/arch/vax/include: asm.h

Log Message:
Remove an unneeded indirect access from polyd/polyf macros


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/vax/include/asm.h

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

Modified files:

Index: src/sys/arch/vax/include/asm.h
diff -u src/sys/arch/vax/include/asm.h:1.24 src/sys/arch/vax/include/asm.h:1.25
--- src/sys/arch/vax/include/asm.h:1.24	Thu Jul 28 22:54:02 2011
+++ src/sys/arch/vax/include/asm.h	Tue May 29 17:25:38 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.24 2011/07/28 22:54:02 matt Exp $ */
+/*	$NetBSD: asm.h,v 1.25 2012/05/29 17:25:38 matt Exp $ */
 /*
  * Copyright (c) 1982, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -115,7 +115,7 @@
 1:
 	mulf2	%r1, %r0		/* result *= arg */
 2:
-	addf2	*(%r3)+, %r0		/* result += c[n] */
+	addf2	(%r3)+, %r0		/* result += c[n] */
 	sobgtr	%r2, 1b
 	clrf	%r1			/* r1 is 0 on finish */
 .endm
@@ -130,7 +130,7 @@
 1:
 	muld2	%r4, %r0		/* result *= arg */
 2:
-	addd2	*(%r3)+, %r0		/* result += c[n] */
+	addd2	(%r3)+, %r0		/* result += c[n] */
 	sobgtr	%r2, 1b
 	clrq	%r4			/* r4, r5 are 0 on finish */
 .endm



CVS commit: src/external/bsd/llvm

2012-05-29 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Tue May 29 19:31:53 UTC 2012

Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/bin/tblgen: Makefile
src/external/bsd/llvm/include: Makefile
src/external/bsd/llvm/lib/libLLVMTableGen: Makefile
src/external/bsd/llvm/lib/libclangDriver: Makefile
src/external/bsd/llvm/lib/libclangStaticAnalyzerCore: Makefile

Log Message:
Update Clang/LLVM snapshot to 156412. Refactoring.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/llvm/bin/tblgen/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/llvm/include/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libLLVMTableGen/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libclangDriver/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile

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

Modified files:

Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.34 src/external/bsd/llvm/Makefile.inc:1.35
--- src/external/bsd/llvm/Makefile.inc:1.34	Sun Apr 29 19:19:04 2012
+++ src/external/bsd/llvm/Makefile.inc	Tue May 29 19:31:52 2012
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile.inc,v 1.34 2012/04/29 19:19:04 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.35 2012/05/29 19:31:52 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
 
 .include bsd.own.mk
 
-LLVM_REVISION=	155677
-CLANG_REVISION=	155677
+LLVM_REVISION=	156412
+CLANG_REVISION=	156412
 
 LLVM_SRCDIR:=	${.PARSEDIR}/dist/llvm
 CLANG_SRCDIR:=	${.PARSEDIR}/dist/clang

Index: src/external/bsd/llvm/bin/tblgen/Makefile
diff -u src/external/bsd/llvm/bin/tblgen/Makefile:1.11 src/external/bsd/llvm/bin/tblgen/Makefile:1.12
--- src/external/bsd/llvm/bin/tblgen/Makefile:1.11	Thu Mar  1 01:12:48 2012
+++ src/external/bsd/llvm/bin/tblgen/Makefile	Tue May 29 19:31:52 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2012/03/01 01:12:48 joerg Exp $
+#	$NetBSD: Makefile,v 1.12 2012/05/29 19:31:52 joerg Exp $
 
 PROG_CXX=	llvm-tblgen
 NOMAN=		yes
@@ -32,7 +32,6 @@ SRCS=	AsmMatcherEmitter.cpp \
 	PseudoLoweringEmitter.cpp \
 	RegisterInfoEmitter.cpp \
 	SetTheory.cpp \
-	StringMatcher.cpp \
 	SubtargetEmitter.cpp \
 	TGValueTypes.cpp \
 	TableGen.cpp \

Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.8 src/external/bsd/llvm/include/Makefile:1.9
--- src/external/bsd/llvm/include/Makefile:1.8	Wed Apr  4 10:42:01 2012
+++ src/external/bsd/llvm/include/Makefile	Tue May 29 19:31:52 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2012/04/04 10:42:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.9 2012/05/29 19:31:52 joerg Exp $
 
 .include bsd.init.mk
 
@@ -92,10 +92,6 @@ CLANG_TABLEGEN_INCLUDES.Options.td=	-I${
 CLANG_TABLEGEN_OUTPUT.Options.td= \
 	clang/Driver/Options.inc|-gen-opt-parser-defs
 
-CLANG_TABLEGEN_INCLUDES.CC1Options.td=	-I${CLANG_SRCDIR}/include/clang/Driver
-CLANG_TABLEGEN_OUTPUT.CC1Options.td= \
-	clang/Driver/CC1Options.inc|-gen-opt-parser-defs
-
 CLANG_TABLEGEN_INCLUDES.CC1AsOptions.td=	-I${CLANG_SRCDIR}/include/clang/Driver
 CLANG_TABLEGEN_OUTPUT.CC1AsOptions.td= \
 	clang/Driver/CC1AsOptions.inc|-gen-opt-parser-defs

Index: src/external/bsd/llvm/lib/libLLVMTableGen/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMTableGen/Makefile:1.2 src/external/bsd/llvm/lib/libLLVMTableGen/Makefile:1.3
--- src/external/bsd/llvm/lib/libLLVMTableGen/Makefile:1.2	Wed Jan 11 23:24:48 2012
+++ src/external/bsd/llvm/lib/libLLVMTableGen/Makefile	Tue May 29 19:31:52 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2012/01/11 23:24:48 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2012/05/29 19:31:52 joerg Exp $
 
 LIB=	LLVMTableGen
 
@@ -9,6 +9,7 @@ LIB=	LLVMTableGen
 SRCS+=	Error.cpp \
 	Main.cpp \
 	Record.cpp \
+	StringMatcher.cpp \
 	TableGenAction.cpp \
 	TableGenBackend.cpp \
 	TGLexer.cpp \

Index: src/external/bsd/llvm/lib/libclangDriver/Makefile
diff -u src/external/bsd/llvm/lib/libclangDriver/Makefile:1.3 src/external/bsd/llvm/lib/libclangDriver/Makefile:1.4
--- src/external/bsd/llvm/lib/libclangDriver/Makefile:1.3	Tue Feb 28 17:09:31 2012
+++ src/external/bsd/llvm/lib/libclangDriver/Makefile	Tue May 29 19:31:52 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2012/02/28 17:09:31 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2012/05/29 19:31:52 joerg Exp $
 
 LIB=	clangDriver
 
@@ -9,7 +9,6 @@ LIB=	clangDriver
 SRCS+=	Action.cpp \
 	Arg.cpp \
 	ArgList.cpp \
-	CC1Options.cpp \
 	CC1AsOptions.cpp \
 	Compilation.cpp \
 	Driver.cpp \

Index: src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile
diff -u src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile:1.9 src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile:1.10
--- src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile:1.9	Wed Apr  4 

CVS commit: src/sys/dev/usb

2012-05-29 Thread NONAKA Kimihiro
Module Name:src
Committed By:   nonaka
Date:   Tue May 29 19:47:56 UTC 2012

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Added some Ralink wlan adapters.


To generate a diff of this commit:
cvs rdiff -u -r1.617 -r1.618 src/sys/dev/usb/usbdevs

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

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.617 src/sys/dev/usb/usbdevs:1.618
--- src/sys/dev/usb/usbdevs:1.617	Tue May 29 14:04:48 2012
+++ src/sys/dev/usb/usbdevs	Tue May 29 19:47:56 2012
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.617 2012/05/29 14:04:48 christos Exp $
+$NetBSD: usbdevs,v 1.618 2012/05/29 19:47:56 nonaka Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -195,6 +195,7 @@ vendor IOMEGA		0x059b	Iomega
 vendor ATREND		0x059c	A-Trend Technology
 vendor AID		0x059d	Advanced Input Devices
 vendor LACIE		0x059f	LaCie
+vendor CISCOLINKSYS3	0x05a6	Cisco-Linksys
 vendor OMNIVISION	0x05a9	OmniVision
 vendor INSYSTEM		0x05ab	In-System Design
 vendor APPLE		0x05ac	Apple Computer
@@ -307,6 +308,7 @@ vendor APTIO		0x07d2	Aptio Products
 vendor ARASAN		0x07da	Arasan Chip Systems
 vendor ALLIEDCABLE	0x07e6	Allied Cable
 vendor STSN		0x07ef	STSN
+vendor BEWAN		0x07fa	Bewan
 vendor ZOOM		0x0803	Zoom Telephonics
 vendor BROADLOGIC	0x0827	BroadLogic
 vendor HANDSPRING	0x082d	Handspring
@@ -436,7 +438,9 @@ vendor FALCOM		0x0f94	Falcom Wireless Co
 vendor RIM		0x0fca	Research In Motion
 vendor DYNASTREAM	0x0fcf	Dynastream Innovations
 vendor SUNRISING	0x0fe6	SUNRISING
+vendor DVICO		0x0fe9	DViCO
 vendor QUALCOMM		0x1004	Qualcomm
+vendor MOTOROLA4	0x100d	Motorola
 vendor HP3		0x103c	Hewlett Packard
 vendor GIGABYTE		0x1044	GIGABYTE
 vendor MOTOROLA		0x1063	Motorola
@@ -498,6 +502,7 @@ vendor INSIDEOUT	0x1608	Inside Out Netwo
 vendor GOODWAY		0x1631	Good Way Technology
 vendor ENTREGA		0x1645	Entrega
 vendor ACTIONTEC	0x1668	Actiontec Electronics
+vendor CISCOLINKSYS2	0x167b	Cisco-Linksys
 vendor ATHEROS		0x168c	Atheros Communications
 vendor GIGASET		0x1690	Gigaset
 vendor ANYDATA		0x16d5	AnyDATA Inc.
@@ -517,6 +522,7 @@ vendor QUALCOMMINC	0x19d2	Qualcomm, Inco
 vendor QUANTA		0x1a32	Quanta
 vendor TERMINUS		0x1a40	Terminus Technology
 vendor WINCHIPHEAD2	0x1a86	QinHeng Electronics
+vendor OVISLINK		0x1b75	OvisLink
 vendor MPMAN		0x1cae	MPMan
 vendor 4GSYSTEMS	0x1c9e	4G Systems
 vendor PEGATRON		0x1d4d	Pegatron
@@ -525,6 +531,7 @@ vendor DLINK		0x2001	D-Link
 vendor PLANEX2		0x2019	Planex Communications
 vendor ENCORE		0x203d	Encore
 vendor HAUPPAUGE2	0x2040	Hauppauge Computer Works
+vendor PARA		0x20b8	PARA Industrial
 vendor TRENDNET		0x20f4	TRENDnet
 vendor DLINK3		0x2101  D-Link
 vendor ERICSSON		0x2282	Ericsson
@@ -556,6 +563,7 @@ vendor ARKMICROCHIPS	0x6547	ArkMicroChip
 vendor 3COM2		0x6891	3Com
 vendor EDIMAX		0x7392	EDIMAX
 vendor INTEL		0x8086	Intel
+vendor ALLWIN		0x8516	ALLWIN Tech
 vendor MOSCHIP		0x9710	MosChip Semiconductor
 vendor xxFTDI		0x9e88  FTDI
 vendor CACE		0xcace	CACE Technologies
@@ -639,6 +647,7 @@ product ACCTON RT3070_4		0xa512	RT3070
 product ACCTON RT2870_4		0xa618	RT2870
 product ACCTON RT3070_1		0xa701	RT3070
 product ACCTON RT3070_2		0xa702	RT3070
+product ACCTON RT3070_6		0xa703	RT3070
 product ACCTON RT2870_1		0xb522	RT2870
 product ACCTON RT3070_3		0xc522	RT3070
 product ACCTON RT3070_5		0xd522	RT3070
@@ -724,6 +733,7 @@ product AIPTEK2 PENCAM_MEGA_1_3 0x504a	P
 product AIRPRIME PC5220		0x0112	CDMA Wireless PC Card
 
 /* Airties products */
+product AIRTIES RT3070_2	0x2012	RT3070
 product AIRTIES RT3070		0x2310	RT3070
 
 /* AKS products */
@@ -741,6 +751,15 @@ product ALCOR AU9814		0x9215	AU9814 Hub
 product ALCOR SM_KBD		0x9410	MicroConnectors/StrongMan Keyboard
 product ALCOR NEC_KBD_HUB	0x9472	NEC Kbd Hub
 
+/* ALLWIN Tech products */
+product ALLWIN RT2070		0x2070	RT2070
+product ALLWIN RT2770		0x2770	RT2770
+product ALLWIN RT2870		0x2870	RT2870
+product ALLWIN RT3070		0x3070	RT3070
+product ALLWIN RT3071		0x3071	RT3071
+product ALLWIN RT3072		0x3072	RT3072
+product ALLWIN RT3572		0x3572	RT3572
+
 /* Altec Lansing products */
 product ALTEC ADA70		0x0070	ADA70 Speakers
 product ALTEC ASC495		0xff05	ASC495 Speakers
@@ -841,6 +860,8 @@ product	ASUSTEK U3100		0x173f	My Cinema 
 product ASUSTEK RT2870_3	0x1742	RT2870
 product ASUSTEK RT2870_4	0x1760	RT2870
 product ASUSTEK RT2870_5	0x1761	RT2870
+product ASUSTEK RT3070		0x1784	RT3070
+product ASUSTEK RT3070_1	0x1790	RT3070
 product ASUSTEK MYPAL_A730	0x4202	MyPal A730
 product ASUSTEK2 USBN11		0x0b05	USB-N11
 
@@ -900,6 +921,10 @@ product AVM FRITZWLAN		0x8401	FRITZ!WLAN
 product AZUREWAVE RT2870_1	0x3247	RT2870
 product AZUREWAVE RT2870_2	0x3262	RT2870
 product AZUREWAVE RT3070	0x3273	RT3070
+product AZUREWAVE RT3070_2	0x3284	RT3070
+product AZUREWAVE RT3070_3	0x3305	RT3070
+product AZUREWAVE RT3070_4	0x3307	RT3070
+product AZUREWAVE RT3070_5	0x3321	RT3070
 product AZUREWAVE RTL8188CE_1	

CVS commit: src/sys/dev/usb

2012-05-29 Thread NONAKA Kimihiro
Module Name:src
Committed By:   nonaka
Date:   Tue May 29 19:49:10 UTC 2012

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.609 -r1.610 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.610 -r1.611 src/sys/dev/usb/usbdevs_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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.609 src/sys/dev/usb/usbdevs.h:1.610
--- src/sys/dev/usb/usbdevs.h:1.609	Tue May 29 14:05:01 2012
+++ src/sys/dev/usb/usbdevs.h	Tue May 29 19:49:10 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.609 2012/05/29 14:05:01 christos Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.610 2012/05/29 19:49:10 nonaka Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.617 2012/05/29 14:04:48 christos Exp
+ *	NetBSD: usbdevs,v 1.618 2012/05/29 19:47:56 nonaka Exp
  */
 
 /*
@@ -202,6 +202,7 @@
 #define	USB_VENDOR_ATREND	0x059c		/* A-Trend Technology */
 #define	USB_VENDOR_AID	0x059d		/* Advanced Input Devices */
 #define	USB_VENDOR_LACIE	0x059f		/* LaCie */
+#define	USB_VENDOR_CISCOLINKSYS3	0x05a6		/* Cisco-Linksys */
 #define	USB_VENDOR_OMNIVISION	0x05a9		/* OmniVision */
 #define	USB_VENDOR_INSYSTEM	0x05ab		/* In-System Design */
 #define	USB_VENDOR_APPLE	0x05ac		/* Apple Computer */
@@ -314,6 +315,7 @@
 #define	USB_VENDOR_ARASAN	0x07da		/* Arasan Chip Systems */
 #define	USB_VENDOR_ALLIEDCABLE	0x07e6		/* Allied Cable */
 #define	USB_VENDOR_STSN	0x07ef		/* STSN */
+#define	USB_VENDOR_BEWAN	0x07fa		/* Bewan */
 #define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics */
 #define	USB_VENDOR_BROADLOGIC	0x0827		/* BroadLogic */
 #define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring */
@@ -443,7 +445,9 @@
 #define	USB_VENDOR_RIM	0x0fca		/* Research In Motion */
 #define	USB_VENDOR_DYNASTREAM	0x0fcf		/* Dynastream Innovations */
 #define	USB_VENDOR_SUNRISING	0x0fe6		/* SUNRISING */
+#define	USB_VENDOR_DVICO	0x0fe9		/* DViCO */
 #define	USB_VENDOR_QUALCOMM	0x1004		/* Qualcomm */
+#define	USB_VENDOR_MOTOROLA4	0x100d		/* Motorola */
 #define	USB_VENDOR_HP3	0x103c		/* Hewlett Packard */
 #define	USB_VENDOR_GIGABYTE	0x1044		/* GIGABYTE */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
@@ -505,6 +509,7 @@
 #define	USB_VENDOR_GOODWAY	0x1631		/* Good Way Technology */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
+#define	USB_VENDOR_CISCOLINKSYS2	0x167b		/* Cisco-Linksys */
 #define	USB_VENDOR_ATHEROS	0x168c		/* Atheros Communications */
 #define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
 #define	USB_VENDOR_ANYDATA	0x16d5		/* AnyDATA Inc. */
@@ -524,6 +529,7 @@
 #define	USB_VENDOR_QUANTA	0x1a32		/* Quanta */
 #define	USB_VENDOR_TERMINUS	0x1a40		/* Terminus Technology */
 #define	USB_VENDOR_WINCHIPHEAD2	0x1a86		/* QinHeng Electronics */
+#define	USB_VENDOR_OVISLINK	0x1b75		/* OvisLink */
 #define	USB_VENDOR_MPMAN	0x1cae		/* MPMan */
 #define	USB_VENDOR_4GSYSTEMS	0x1c9e		/* 4G Systems */
 #define	USB_VENDOR_PEGATRON	0x1d4d		/* Pegatron */
@@ -532,6 +538,7 @@
 #define	USB_VENDOR_PLANEX2	0x2019		/* Planex Communications */
 #define	USB_VENDOR_ENCORE	0x203d		/* Encore */
 #define	USB_VENDOR_HAUPPAUGE2	0x2040		/* Hauppauge Computer Works */
+#define	USB_VENDOR_PARA	0x20b8		/* PARA Industrial */
 #define	USB_VENDOR_TRENDNET	0x20f4		/* TRENDnet */
 #define	USB_VENDOR_DLINK3	0x2101		/* D-Link */
 #define	USB_VENDOR_ERICSSON	0x2282		/* Ericsson */
@@ -563,6 +570,7 @@
 #define	USB_VENDOR_3COM2	0x6891		/* 3Com */
 #define	USB_VENDOR_EDIMAX	0x7392		/* EDIMAX */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
+#define	USB_VENDOR_ALLWIN	0x8516		/* ALLWIN Tech */
 #define	USB_VENDOR_MOSCHIP	0x9710		/* MosChip Semiconductor */
 #define	USB_VENDOR_xxFTDI	0x9e88		/* FTDI */
 #define	USB_VENDOR_CACE	0xcace		/* CACE Technologies */
@@ -646,6 +654,7 @@
 #define	USB_PRODUCT_ACCTON_RT2870_4	0xa618		/* RT2870 */
 #define	USB_PRODUCT_ACCTON_RT3070_1	0xa701		/* RT3070 */
 #define	USB_PRODUCT_ACCTON_RT3070_2	0xa702		/* RT3070 */
+#define	USB_PRODUCT_ACCTON_RT3070_6	0xa703		/* RT3070 */
 #define	USB_PRODUCT_ACCTON_RT2870_1	0xb522		/* RT2870 */
 #define	USB_PRODUCT_ACCTON_RT3070_3	0xc522		/* RT3070 */
 #define	USB_PRODUCT_ACCTON_RT3070_5	0xd522		/* RT3070 */
@@ -731,6 +740,7 @@
 #define	USB_PRODUCT_AIRPRIME_PC5220	0x0112		/* CDMA Wireless PC Card */
 
 /* Airties products */
+#define	USB_PRODUCT_AIRTIES_RT3070_2	0x2012		/* RT3070 */
 #define	USB_PRODUCT_AIRTIES_RT3070	0x2310		/* RT3070 */
 
 /* AKS products */
@@ -748,6 +758,15 @@
 #define	USB_PRODUCT_ALCOR_SM_KBD	0x9410		/* MicroConnectors/StrongMan Keyboard */
 #define	USB_PRODUCT_ALCOR_NEC_KBD_HUB	0x9472		/* NEC Kbd Hub */
 
+/* ALLWIN Tech products */
+#define	USB_PRODUCT_ALLWIN_RT2070	0x2070		/* RT2070 */
+#define	USB_PRODUCT_ALLWIN_RT2770	0x2770		/* RT2770 */

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

2012-05-29 Thread NONAKA Kimihiro
Module Name:src
Committed By:   nonaka
Date:   Tue May 29 20:02:42 UTC 2012

Modified Files:
src/sys/arch/evbmips/conf: LOONGSON

Log Message:
Add SYSV{MSG,SEM,SHM} options.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/conf/LOONGSON

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/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.10 src/sys/arch/evbmips/conf/LOONGSON:1.11
--- src/sys/arch/evbmips/conf/LOONGSON:1.10	Tue May 29 14:12:28 2012
+++ src/sys/arch/evbmips/conf/LOONGSON	Tue May 29 20:02:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.10 2012/05/29 14:12:28 christos Exp $
+# $NetBSD: LOONGSON,v 1.11 2012/05/29 20:02:42 nonaka Exp $
 #
 # LOONGSON machine description file
 # 
@@ -22,7 +22,7 @@ include		arch/evbmips/conf/std.loongson
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		LOONGSON-$Revision: 1.10 $
+#ident 		LOONGSON-$Revision: 1.11 $
 
 maxusers	16
 
@@ -58,6 +58,11 @@ options 	NTP			# network time protocol
 
 #options 	WINCE_DEFAULT_SETTING	# Debugging use
 
+# Note: SysV IPC parameters can be changed dynamically; see sysctl(8).
+options 	SYSVMSG		# System V-like message queues
+options 	SYSVSEM		# System V-like semaphores
+options 	SYSVSHM		# System V-like memory sharing
+
 #options 	SYSCALL_DEBUG		# for debug
 #options 	HPCMIPS_L1CACHE_DISABLE	# disable L1 cache for debug
 options 	USERCONF		# userconf(4) support



CVS commit: src/sys/dev/usb

2012-05-29 Thread NONAKA Kimihiro
Module Name:src
Committed By:   nonaka
Date:   Tue May 29 21:10:40 UTC 2012

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Added Buffalo WLI-UC-GNM2T.


To generate a diff of this commit:
cvs rdiff -u -r1.618 -r1.619 src/sys/dev/usb/usbdevs

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

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.618 src/sys/dev/usb/usbdevs:1.619
--- src/sys/dev/usb/usbdevs:1.618	Tue May 29 19:47:56 2012
+++ src/sys/dev/usb/usbdevs	Tue May 29 21:10:40 2012
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.618 2012/05/29 19:47:56 nonaka Exp $
+$NetBSD: usbdevs,v 1.619 2012/05/29 21:10:40 nonaka Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1926,6 +1926,7 @@ product MELCO WLIUCGNHP		0x0158	WLI-UC-G
 product MELCO WLIUCGN		0x015d	WLI-UC-GN
 product MELCO WLIUCG301N	0x016f	WLI-UC-G301N
 product MELCO WLIUCGNM		0x01a2	WLI-UC-GNM
+product MELCO WLIUCGNM2T	0x01ee	WLI-UC-GNM2T
 
 /* Merlin products */
 product MERLIN V620 0x1110  Merlin V620



CVS commit: src/sys/dev/usb

2012-05-29 Thread NONAKA Kimihiro
Module Name:src
Committed By:   nonaka
Date:   Tue May 29 21:11:37 UTC 2012

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.610 -r1.611 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.611 -r1.612 src/sys/dev/usb/usbdevs_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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.610 src/sys/dev/usb/usbdevs.h:1.611
--- src/sys/dev/usb/usbdevs.h:1.610	Tue May 29 19:49:10 2012
+++ src/sys/dev/usb/usbdevs.h	Tue May 29 21:11:37 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.610 2012/05/29 19:49:10 nonaka Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.611 2012/05/29 21:11:37 nonaka Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.618 2012/05/29 19:47:56 nonaka Exp
+ *	NetBSD: usbdevs,v 1.619 2012/05/29 21:10:40 nonaka Exp
  */
 
 /*
@@ -1933,6 +1933,7 @@
 #define	USB_PRODUCT_MELCO_WLIUCGN	0x015d		/* WLI-UC-GN */
 #define	USB_PRODUCT_MELCO_WLIUCG301N	0x016f		/* WLI-UC-G301N */
 #define	USB_PRODUCT_MELCO_WLIUCGNM	0x01a2		/* WLI-UC-GNM */
+#define	USB_PRODUCT_MELCO_WLIUCGNM2T	0x01ee		/* WLI-UC-GNM2T */
 
 /* Merlin products */
 #define	USB_PRODUCT_MERLIN_V620	0x1110		/* Merlin V620 */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.611 src/sys/dev/usb/usbdevs_data.h:1.612
--- src/sys/dev/usb/usbdevs_data.h:1.611	Tue May 29 19:49:10 2012
+++ src/sys/dev/usb/usbdevs_data.h	Tue May 29 21:11:37 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.611 2012/05/29 19:49:10 nonaka Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.612 2012/05/29 21:11:37 nonaka Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.618 2012/05/29 19:47:56 nonaka Exp
+ *	NetBSD: usbdevs,v 1.619 2012/05/29 21:10:40 nonaka Exp
  */
 
 /*
@@ -5919,6 +5919,10 @@ const struct usb_product usb_products[] 
 	WLI-UC-GNM,
 	},
 	{
+	USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGNM2T,
+	WLI-UC-GNM2T,
+	},
+	{
 	USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620,
 	Merlin V620,
 	},
@@ -9303,4 +9307,4 @@ const struct usb_product usb_products[] 
 	Prestige,
 	},
 };
-const int usb_nproducts = 1803;
+const int usb_nproducts = 1804;



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

2012-05-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue May 29 22:43:24 UTC 2012

Modified Files:
src/distrib/sets/lists/base: md.sparc64

Log Message:
Add 32bit libexecinfo version


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/lists/base/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/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.155 src/distrib/sets/lists/base/md.sparc64:1.156
--- src/distrib/sets/lists/base/md.sparc64:1.155	Wed May  2 02:43:00 2012
+++ src/distrib/sets/lists/base/md.sparc64	Tue May 29 22:43:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.155 2012/05/02 02:43:00 christos Exp $
+# $NetBSD: md.sparc64,v 1.156 2012/05/29 22:43:24 martin Exp $
 ./libexec/ld.elf_so-sparc			base-sysutil-bin	compat,pic
 ./sbin/edlabel	base-sysutil-root	obsolete
 ./usr/bin/fdformatbase-util-bin
@@ -271,6 +271,8 @@
 ./usr/lib/sparc/libwind.so.0.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/sparc/libwrap.so.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libwrap.so.1.0			base-compat-shlib	compat,pic
+./usr/lib/sparc/libexecinfo.so.0		base-compat-shlib	compat,pic
+./usr/lib/sparc/libexecinfo.so.0.0 		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libz.so.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libz.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/luabase-compat-shlib	compat



CVS commit: xsrc/external/mit/xf86-video-nv/dist/src

2012-05-29 Thread Michael Lorenz
Module Name:xsrc
Committed By:   macallan
Date:   Wed May 30 04:54:27 UTC 2012

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c

Log Message:
don't map the VGA framebuffer if AVOID_VGAHW is defined


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5	Mon Aug  9 16:17:55 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Wed May 30 04:54:27 2012
@@ -1219,7 +1219,9 @@ NVCloseScreen(int scrnIndex, ScreenPtr p
 }
 
 NVUnmapMem(pScrn);
+#ifndef AVOID_VGAHW
 vgaHWUnmapMem(pScrn);
+#endif
 if (pNv-AccelInfoRec)
 XAADestroyInfoRec(pNv-AccelInfoRec);
 if (pNv-CursorInfoRec)
@@ -1259,6 +1261,7 @@ NVFreeScreen(int scrnIndex, int flags)
  * This only gets called when a screen is being deleted.  It does not
  * get called routinely at the end of a server generation.
  */
+  
 if (xf86LoaderCheckSymbol(vgaHWFreeHWRec))
 	vgaHWFreeHWRec(xf86Screens[scrnIndex]);
 NVFreeRec(xf86Screens[scrnIndex]);
@@ -2410,11 +2413,13 @@ NVScreenInit(int scrnIndex, ScreenPtr pS
 }
 
 /* Map the VGA memory when the primary video */
+#ifndef AVOID_VGAHW
 if (pNv-Primary  !pNv-FBDev) {
 	hwp-MapSize = 0x1;
 	if (!vgaHWMapMem(pScrn))
 	return FALSE;
 }
+#endif
 
 if (pNv-FBDev) {
 	fbdevHWSave(pScrn);



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

2012-05-29 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed May 30 05:20:36 UTC 2012

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile

Log Message:
set AVOID_VGAHW on macppc, now this driver works out of the box
should probably be set on all machines where we never use VGA text mode


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-nv/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/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.4	Sun Aug  3 14:47:26 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile	Wed May 30 05:20:36 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2008/08/03 14:47:26 rtr Exp $
+#	$NetBSD: Makefile,v 1.5 2012/05/30 05:20:36 macallan Exp $
 
 DRIVER=		xf86-video-nv
 DRIVER_NAME=	nv_drv
@@ -11,4 +11,8 @@ SRCS+=		g80_dac.c g80_display.c g80_dma.
 SRCS+=		g80_output.c g80_sor.c g80_xaa.c
 MAN=		nv.4
 
+.if ${MACHINE} == macppc
+CPPFLAGS+= -DAVOID_VGAHW
+.endif
+
 .include ../Makefile.xf86-driver