svn commit: r223572 - in projects/largeSMP: bin/sh contrib/top etc etc/devd kerberos5 lib/libprocstat share/mk sys/arm/at91 sys/arm/conf sys/arm/sa11x0 sys/boot sys/cam sys/cam/scsi sys/conf sys/de...

Attilio Rao attilio at FreeBSD.org
Sun Jun 26 17:30:47 UTC 2011


Author: attilio
Date: Sun Jun 26 17:30:46 2011
New Revision: 223572
URL: http://svn.freebsd.org/changeset/base/223572

Log:
  MFC

Added:
  projects/largeSMP/etc/devd/usb.conf
     - copied unchanged from r223571, head/etc/devd/usb.conf
  projects/largeSMP/sys/dev/pci/pci_subr.c
     - copied unchanged from r223571, head/sys/dev/pci/pci_subr.c
  projects/largeSMP/tools/regression/bin/sh/builtins/case10.0
     - copied unchanged from r223571, head/tools/regression/bin/sh/builtins/case10.0
  projects/largeSMP/tools/tools/bus_autoconf/bus_autoconf_format_example.txt
     - copied unchanged from r223571, head/tools/tools/bus_autoconf/bus_autoconf_format_example.txt
  projects/largeSMP/tools/tools/bus_autoconf/bus_load_file.c
     - copied unchanged from r223571, head/tools/tools/bus_autoconf/bus_load_file.c
  projects/largeSMP/tools/tools/bus_autoconf/bus_load_file.h
     - copied unchanged from r223571, head/tools/tools/bus_autoconf/bus_load_file.h
  projects/largeSMP/tools/tools/bus_autoconf/bus_sections.c
     - copied unchanged from r223571, head/tools/tools/bus_autoconf/bus_sections.c
  projects/largeSMP/tools/tools/bus_autoconf/bus_sections.h
     - copied unchanged from r223571, head/tools/tools/bus_autoconf/bus_sections.h
  projects/largeSMP/tools/tools/bus_autoconf/bus_usb.c
     - copied unchanged from r223571, head/tools/tools/bus_autoconf/bus_usb.c
  projects/largeSMP/tools/tools/bus_autoconf/bus_usb.h
     - copied unchanged from r223571, head/tools/tools/bus_autoconf/bus_usb.h
Modified:
  projects/largeSMP/bin/sh/sh.1
  projects/largeSMP/etc/devd/Makefile
  projects/largeSMP/etc/devd/uath.conf
  projects/largeSMP/etc/regdomain.xml
  projects/largeSMP/kerberos5/Makefile
  projects/largeSMP/lib/libprocstat/Makefile
  projects/largeSMP/sys/arm/at91/at91_machdep.c
  projects/largeSMP/sys/arm/conf/CAMBRIA
  projects/largeSMP/sys/arm/sa11x0/assabet_machdep.c
  projects/largeSMP/sys/arm/sa11x0/sa11x0.c
  projects/largeSMP/sys/boot/Makefile
  projects/largeSMP/sys/boot/Makefile.arm
  projects/largeSMP/sys/boot/Makefile.powerpc
  projects/largeSMP/sys/cam/cam_xpt.c
  projects/largeSMP/sys/cam/scsi/scsi_cd.c
  projects/largeSMP/sys/conf/files
  projects/largeSMP/sys/conf/files.ia64
  projects/largeSMP/sys/conf/options
  projects/largeSMP/sys/dev/acpica/acpi_cpu.c
  projects/largeSMP/sys/dev/ath/ah_osdep.c
  projects/largeSMP/sys/dev/ath/ath_hal/ah_internal.h
  projects/largeSMP/sys/dev/ath/if_ath.c
  projects/largeSMP/sys/dev/pci/pci_pci.c
  projects/largeSMP/sys/dev/sound/macio/i2s.c
  projects/largeSMP/sys/dev/usb/input/uep.c
  projects/largeSMP/sys/dev/usb/input/ukbd.c
  projects/largeSMP/sys/dev/usb/input/ums.c
  projects/largeSMP/sys/dev/usb/misc/udbp.c
  projects/largeSMP/sys/dev/usb/misc/ufm.c
  projects/largeSMP/sys/dev/usb/serial/ufoma.c
  projects/largeSMP/sys/dev/usb/serial/umodem.c
  projects/largeSMP/sys/dev/usb/storage/urio.c
  projects/largeSMP/sys/dev/usb/usb_device.c
  projects/largeSMP/sys/dev/usb/usb_lookup.c
  projects/largeSMP/sys/dev/usb/usb_msctest.c
  projects/largeSMP/sys/dev/usb/usbdi.h
  projects/largeSMP/sys/dev/usb/wlan/if_uath.c
  projects/largeSMP/sys/ia64/ia64/clock.c
  projects/largeSMP/sys/ia64/ia64/db_machdep.c
  projects/largeSMP/sys/ia64/ia64/interrupt.c
  projects/largeSMP/sys/ia64/ia64/machdep.c
  projects/largeSMP/sys/ia64/ia64/mp_machdep.c
  projects/largeSMP/sys/ia64/include/pcpu.h
  projects/largeSMP/sys/ia64/include/smp.h
  projects/largeSMP/sys/kern/subr_kdb.c
  projects/largeSMP/sys/kern/subr_smp.c
  projects/largeSMP/sys/kern/sys_capability.c
  projects/largeSMP/sys/mips/atheros/ar71xx_chip.c
  projects/largeSMP/sys/mips/atheros/ar71xx_machdep.c
  projects/largeSMP/sys/mips/atheros/ar71xx_ohci.c
  projects/largeSMP/sys/mips/atheros/ar71xx_setup.c
  projects/largeSMP/sys/mips/atheros/ar724x_chip.c
  projects/largeSMP/sys/mips/atheros/ar91xx_chip.c
  projects/largeSMP/sys/mips/mips/genassym.c
  projects/largeSMP/sys/mips/mips/trap.c
  projects/largeSMP/sys/mips/rmi/dev/xlr/rge.c
  projects/largeSMP/sys/mips/rmi/fmn.c
  projects/largeSMP/sys/mips/rmi/iodi.c
  projects/largeSMP/sys/mips/sentry5/s5_machdep.c
  projects/largeSMP/sys/mips/sibyte/sb_machdep.c
  projects/largeSMP/sys/powerpc/aim/trap_subr32.S
  projects/largeSMP/sys/powerpc/aim/trap_subr64.S
  projects/largeSMP/sys/powerpc/ofw/rtas.c
  projects/largeSMP/sys/powerpc/powermac/fcu.c
  projects/largeSMP/tools/tools/bus_autoconf/Makefile
  projects/largeSMP/tools/tools/bus_autoconf/bus_autoconf.c
  projects/largeSMP/tools/tools/bus_autoconf/bus_autoconf.h
  projects/largeSMP/tools/tools/bus_autoconf/bus_autoconf.sh
  projects/largeSMP/usr.bin/calendar/calendars/calendar.freebsd
  projects/largeSMP/usr.bin/tar/util.c
  projects/largeSMP/usr.bin/tar/write.c
  projects/largeSMP/usr.sbin/mtest/mtest.c
Directory Properties:
  projects/largeSMP/   (props changed)
  projects/largeSMP/cddl/contrib/opensolaris/   (props changed)
  projects/largeSMP/contrib/bind9/   (props changed)
  projects/largeSMP/contrib/binutils/   (props changed)
  projects/largeSMP/contrib/bzip2/   (props changed)
  projects/largeSMP/contrib/compiler-rt/   (props changed)
  projects/largeSMP/contrib/dialog/   (props changed)
  projects/largeSMP/contrib/ee/   (props changed)
  projects/largeSMP/contrib/expat/   (props changed)
  projects/largeSMP/contrib/file/   (props changed)
  projects/largeSMP/contrib/gcc/   (props changed)
  projects/largeSMP/contrib/gdb/   (props changed)
  projects/largeSMP/contrib/gdtoa/   (props changed)
  projects/largeSMP/contrib/gnu-sort/   (props changed)
  projects/largeSMP/contrib/groff/   (props changed)
  projects/largeSMP/contrib/less/   (props changed)
  projects/largeSMP/contrib/libpcap/   (props changed)
  projects/largeSMP/contrib/libstdc++/   (props changed)
  projects/largeSMP/contrib/llvm/   (props changed)
  projects/largeSMP/contrib/llvm/tools/clang/   (props changed)
  projects/largeSMP/contrib/ncurses/   (props changed)
  projects/largeSMP/contrib/netcat/   (props changed)
  projects/largeSMP/contrib/ntp/   (props changed)
  projects/largeSMP/contrib/one-true-awk/   (props changed)
  projects/largeSMP/contrib/openbsm/   (props changed)
  projects/largeSMP/contrib/openpam/   (props changed)
  projects/largeSMP/contrib/pf/   (props changed)
  projects/largeSMP/contrib/sendmail/   (props changed)
  projects/largeSMP/contrib/tcpdump/   (props changed)
  projects/largeSMP/contrib/tcsh/   (props changed)
  projects/largeSMP/contrib/tnftp/   (props changed)
  projects/largeSMP/contrib/top/   (props changed)
  projects/largeSMP/contrib/top/install-sh   (props changed)
  projects/largeSMP/contrib/tzcode/stdtime/   (props changed)
  projects/largeSMP/contrib/tzcode/zic/   (props changed)
  projects/largeSMP/contrib/tzdata/   (props changed)
  projects/largeSMP/contrib/wpa/   (props changed)
  projects/largeSMP/contrib/xz/   (props changed)
  projects/largeSMP/crypto/openssh/   (props changed)
  projects/largeSMP/crypto/openssl/   (props changed)
  projects/largeSMP/gnu/lib/   (props changed)
  projects/largeSMP/gnu/usr.bin/binutils/   (props changed)
  projects/largeSMP/gnu/usr.bin/cc/cc_tools/   (props changed)
  projects/largeSMP/gnu/usr.bin/gdb/   (props changed)
  projects/largeSMP/lib/libc/   (props changed)
  projects/largeSMP/lib/libc/stdtime/   (props changed)
  projects/largeSMP/lib/libutil/   (props changed)
  projects/largeSMP/lib/libz/   (props changed)
  projects/largeSMP/sbin/   (props changed)
  projects/largeSMP/sbin/ipfw/   (props changed)
  projects/largeSMP/share/mk/bsd.arch.inc.mk   (props changed)
  projects/largeSMP/share/zoneinfo/   (props changed)
  projects/largeSMP/sys/   (props changed)
  projects/largeSMP/sys/amd64/include/xen/   (props changed)
  projects/largeSMP/sys/boot/   (props changed)
  projects/largeSMP/sys/boot/i386/efi/   (props changed)
  projects/largeSMP/sys/boot/ia64/efi/   (props changed)
  projects/largeSMP/sys/boot/ia64/ski/   (props changed)
  projects/largeSMP/sys/boot/powerpc/boot1.chrp/   (props changed)
  projects/largeSMP/sys/boot/powerpc/ofw/   (props changed)
  projects/largeSMP/sys/cddl/contrib/opensolaris/   (props changed)
  projects/largeSMP/sys/conf/   (props changed)
  projects/largeSMP/sys/contrib/dev/acpica/   (props changed)
  projects/largeSMP/sys/contrib/octeon-sdk/   (props changed)
  projects/largeSMP/sys/contrib/pf/   (props changed)
  projects/largeSMP/sys/contrib/x86emu/   (props changed)
  projects/largeSMP/usr.bin/calendar/   (props changed)
  projects/largeSMP/usr.bin/csup/   (props changed)
  projects/largeSMP/usr.bin/procstat/   (props changed)
  projects/largeSMP/usr.sbin/ndiscvt/   (props changed)
  projects/largeSMP/usr.sbin/zic/   (props changed)

Modified: projects/largeSMP/bin/sh/sh.1
==============================================================================
--- projects/largeSMP/bin/sh/sh.1	Sun Jun 26 16:11:36 2011	(r223571)
+++ projects/largeSMP/bin/sh/sh.1	Sun Jun 26 17:30:46 2011	(r223572)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd June 18, 2011
+.Dd June 24, 2011
 .Dt SH 1
 .Os
 .Sh NAME
@@ -994,11 +994,22 @@ described later),
 separated by
 .Ql \&|
 characters.
+Tilde expansion, parameter expansion, command substitution,
+arithmetic expansion and quote removal are applied to the word.
+Then, each pattern is expanded in turn using tilde expansion,
+parameter expansion, command substitution and arithmetic expansion and
+the expanded form of the word is checked against it.
+If a match is found, the corresponding list is executed.
 If the selected list is terminated by the control operator
 .Ql ;&
 instead of
 .Ql ;; ,
-execution continues with the next list.
+execution continues with the next list,
+continuing until a list terminated with
+.Ql ;;
+or the end of the
+.Ic case
+command.
 The exit code of the
 .Ic case
 command is the exit code of the last command executed in the list or
@@ -1618,15 +1629,15 @@ There are two restrictions on this: firs
 a string containing a slash, and second,
 a pattern cannot match a string starting with a period
 unless the first character of the pattern is a period.
-The next section describes the patterns used for both
-Pathname Expansion and the
+The next section describes the patterns used for
+Pathname Expansion,
+the four varieties of parameter expansion for substring processing and the
 .Ic case
 command.
 .Ss Shell Patterns
 A pattern consists of normal characters, which match themselves,
 and meta-characters.
 The meta-characters are
-.Ql \&! ,
 .Ql * ,
 .Ql \&? ,
 and
@@ -1656,7 +1667,7 @@ matches a
 .Ql \&[
 rather than introducing a character class.
 A character class matches any of the characters between the square brackets.
-A range of characters may be specified using a minus sign.
+A locale-dependent range of characters may be specified using a minus sign.
 A named class of characters (see
 .Xr wctype 3 )
 may be specified by surrounding the name with
@@ -1669,12 +1680,17 @@ is a shell pattern that matches a single
 The character class may be complemented by making an exclamation point
 .Pq Ql !\&
 the first character of the character class.
+A caret
+.Pq Ql ^
+has the same effect but is non-standard.
 .Pp
 To include a
 .Ql \&]
 in a character class, make it the first character listed
 (after the
-.Ql \&! ,
+.Ql \&!
+or
+.Ql ^ ,
 if any).
 To include a
 .Ql - ,

Modified: projects/largeSMP/etc/devd/Makefile
==============================================================================
--- projects/largeSMP/etc/devd/Makefile	Sun Jun 26 16:11:36 2011	(r223571)
+++ projects/largeSMP/etc/devd/Makefile	Sun Jun 26 17:30:46 2011	(r223572)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FILES=	asus.conf uath.conf
+FILES=	asus.conf uath.conf usb.conf
 
 NO_OBJ=
 FILESDIR=	/etc/devd

Modified: projects/largeSMP/etc/devd/uath.conf
==============================================================================
--- projects/largeSMP/etc/devd/uath.conf	Sun Jun 26 16:11:36 2011	(r223571)
+++ projects/largeSMP/etc/devd/uath.conf	Sun Jun 26 17:30:46 2011	(r223572)
@@ -3,13 +3,13 @@
 # Atheros USB wireless network device specific devd events
 
 # Accton
-#   SMCWUSB-G and SMCWUSBT-G2
+#   SMCWUSBT-G2
 notify 100 {
 	match "system"		"USB";
 	match "subsystem"	"DEVICE";
 	match "type"		"ATTACH";
 	match "vendor"		"0x083a";
-	match "product"		"(0x4505|0x4507)";
+	match "product"		"0x4507";
 	action "/usr/sbin/uathload -d /dev/$cdev";
 };
 

Copied: projects/largeSMP/etc/devd/usb.conf (from r223571, head/etc/devd/usb.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/largeSMP/etc/devd/usb.conf	Sun Jun 26 17:30:46 2011	(r223572, copy of r223571, head/etc/devd/usb.conf)
@@ -0,0 +1,4275 @@
+#
+# $FreeBSD$
+#
+# This file was automatically generated by "tools/bus_autoconf.sh".
+# Please do not edit!
+#
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "product" "0x1290";
+	match "intclass" "0xff";
+	match "intsubclass" "0xfd";
+	match "intprotocol" "0x01";
+	action "kldload if_ipheth";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "product" "0x1292";
+	match "intclass" "0xff";
+	match "intsubclass" "0xfd";
+	match "intprotocol" "0x01";
+	action "kldload if_ipheth";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "product" "0x1294";
+	match "intclass" "0xff";
+	match "intsubclass" "0xfd";
+	match "intprotocol" "0x01";
+	action "kldload if_ipheth";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "product" "0x1297";
+	match "intclass" "0xff";
+	match "intsubclass" "0xfd";
+	match "intprotocol" "0x01";
+	action "kldload if_ipheth";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0104";
+	match "product" "0x00be";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0123";
+	match "product" "0x0001";
+	action "kldload uep";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03e8";
+	match "product" "0x0008";
+	action "kldload if_kue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03eb";
+	match "product" "0x2109";
+	action "kldload uftdi";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "0x0121";
+	action "kldload ugensa";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "(0x1016|0x1116|0x1216)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "(0x1b1d|0x1e1d)";
+	action "kldload u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "(0x2016|0x2116|0x2216|0x3016|0x3116|0x3216)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "0x3524";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "(0x4016|0x4116|0x4216|0x5016|0x5116|0x5216)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "0x811c";
+	action "kldload if_aue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "0xca02";
+	action "kldload if_urtw";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0402";
+	match "product" "0x5632";
+	action "kldload if_cdce";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0403";
+	match "product" "(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)";
+	action "kldload uftdi";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0408";
+	match "product" "0x0304";
+	action "kldload if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0408";
+	match "product" "(0x1000|0xea02|0xea03|0xea04|0xea05|0xea06)";
+	action "kldload u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0409";
+	match "product" "(0x00d5|0x00d6|0x00d7|0x8024|0x8025)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "(0x0001|0x0005|0x0009)";
+	action "kldload if_aue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "0x0012";
+	action "kldload if_rue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "0x003d";
+	action "kldload if_axe";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "(0x005e|0x0066|0x0067)";
+	action "kldload if_ural";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "0x006e";
+	action "kldload if_axe";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "0x008b";
+	action "kldload if_ural";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "0x00b3";
+	action "kldload uftdi";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "(0x00d8|0x00d9)";
+	action "kldload if_rum";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "0x00da";
+	action "kldload if_zyd";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "0x00e8";
+	action "kldload if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "(0x0116|0x0119)";
+	action "kldload if_rum";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "0x012e";
+	action "kldload if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "0x0137";
+	action "kldload if_rum";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "(0x0148|0x0150|0x015d|0x016f)";
+	action "kldload if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0413";
+	match "product" "0x2101";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0423";
+	match "product" "(0x000a|0x000c)";
+	action "kldload if_cue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x043e";
+	match "product" "0x9c01";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x045a";
+	match "product" "(0x5001|0x5002)";
+	action "kldload urio";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x045b";
+	match "product" "0x0053";
+	action "kldload uslcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x045e";
+	match "product" "0x0079";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x045e";
+	match "product" "0x007a";
+	action "kldload if_aue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x045e";
+	match "product" "(0x00ce|0x0400|0x0401|0x0402|0x0403|0x0404|0x0405|0x0406|0x0407|0x0408|0x0409|0x040a|0x040b|0x040c|0x040d|0x040e|0x040f|0x0410|0x0411|0x0412|0x0413|0x0414|0x0415|0x0416|0x0417|0x0432|0x0433|0x0434|0x0435|0x0436|0x0437|0x0438|0x0439|0x043a|0x043b|0x043c|0x043d|0x043e|0x043f|0x0440|0x0441|0x0442|0x0443|0x0444|0x0445|0x0446|0x0447|0x0448|0x0449|0x044a|0x044b|0x044c|0x044d|0x044e|0x044f|0x0450|0x0451|0x0452|0x0453|0x0454|0x0455|0x0456|0x0457|0x0458|0x0459|0x045a|0x045b|0x045c|0x045d|0x045e|0x045f|0x0460|0x0461|0x0462|0x0463|0x0464|0x0465|0x0466|0x0467|0x0468|0x0469|0x046a|0x046b|0x046c|0x046d|0x046e|0x046f|0x0470|0x0471|0x0472|0x0473|0x0474|0x0475|0x0476|0x0477|0x0478|0x0479|0x047a|0x047b|0x04c8|0x04c9|0x04ca|0x04cb|0x04cc|0x04cd|0x04ce|0x04d7|0x04d8|0x04d9|0x04da|0x04db|0x04dc|0x04dd|0x04de|0x04df|0x04e0|0x04e1|0x04e2|0x04e3|0x04e4|0x04e5|0x04e6|0x04e7|0x04e8|0x04e9|0x04ea)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0471";
+	match "product" "0x066a";
+	action "kldload uslcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0471";
+	match "product" "0x1236";
+	action "kldload if_zyd";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0471";
+	match "product" "0x200f";
+	action "kldload if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0482";
+	match "product" "0x0203";
+	action "kldload umodem";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0489";
+	match "product" "(0xe000|0xe003)";
+	action "kldload uslcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x049f";
+	match "product" "(0x0003|0x0032)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x049f";
+	match "product" "0x505a";
+	action "kldload if_cdce";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04a4";
+	match "product" "0x0014";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04a5";
+	match "product" "0x4027";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04a5";
+	match "product" "0x4068";
+	action "kldload u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04ad";
+	match "product" "(0x0301|0x0302|0x0303|0x0306)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04b4";
+	match "product" "0x1002";
+	action "kldload ufm";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04b7";
+	match "product" "0x0531";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04b8";
+	match "product" "(0x0521|0x0522)";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04bb";
+	match "product" "0x0901";
+	action "kldload if_kue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04bb";
+	match "product" "(0x0904|0x0913)";
+	action "kldload if_aue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04bb";
+	match "product" "0x0930";
+	action "kldload if_axe";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04bb";
+	match "product" "(0x0944|0x0945|0x0947|0x0948)";
+	action "kldload if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04bb";
+	match "product" "(0x0a03|0x0a0e)";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04bf";
+	match "product" "(0x0115|0x0117)";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04c5";
+	match "product" "(0x1058|0x1079)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04da";
+	match "product" "0x2500";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04da";
+	match "product" "0x3900";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04dd";
+	match "product" "(0x8004|0x8005|0x8006|0x8007|0x9031)";
+	action "kldload if_cdce";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04dd";
+	match "product" "(0x9102|0x9121|0x9123|0x9151|0x91ac|0x9242)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04e8";
+	match "product" "(0x5f00|0x5f01|0x5f02|0x5f03|0x5f04)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04e8";
+	match "product" "0x6601";
+	action "kldload uvisor";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04e8";
+	match "product" "(0x6611|0x6613|0x6615|0x6617|0x6619|0x661b|0x662e|0x6630|0x6632)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04e8";
+	match "product" "0x8001";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04f1";
+	match "product" "0x3008";
+	action "kldload if_axe";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04f1";
+	match "product" "(0x3011|0x3012)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0502";
+	match "product" "(0x1631|0x1632|0x16e1|0x16e2|0x16e3)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0506";
+	match "product" "(0x03e8|0x11f8)";
+	action "kldload if_kue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0506";
+	match "product" "0x4601";
+	action "kldload if_aue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x0103";
+	action "kldload ubsa";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x0109";
+	action "kldload umct";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x0121";
+	action "kldload if_aue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x0257";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x0409";
+	action "kldload umct";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x1203";
+	action "kldload ubsa";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x4050";
+	action "kldload if_zyd";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x5055";
+	action "kldload if_axe";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x7050";
+	action "kldload if_upgt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "(0x7050|0x7051)";
+	action "kldload if_ural";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x705a";
+	action "kldload if_rum";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x705c";
+	action "kldload if_zyd";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x705e";
+	action "kldload if_urtw";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "(0x8053|0x805c|0x815c|0x825a)";
+	action "kldload if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x905b";
+	action "kldload if_rum";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
+	match "product" "0x935a";
+	action "kldload if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0525";
+	match "product" "0x1080";
+	action "kldload udbp";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0525";
+	match "product" "0xa4a2";
+	action "kldload if_cdce";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0536";
+	match "product" "0x01a0";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0543";
+	match "product" "(0x0ed9|0x1527|0x1529|0x152b|0x152e|0x1921|0x1922|0x1923)";
+	action "kldload uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0547";
+	match "product" "0x2008";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0547";
+	match "product" "0x2720";
+	action "kldload udbp";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x054c";
+	match "product" "(0x0038|0x0066|0x0095|0x009a|0x00da|0x0169)";
+	action "kldload uvisor";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x054c";
+	match "product" "0x0437";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0557";
+	match "product" "0x2002";
+	action "kldload if_kue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0557";
+	match "product" "0x2007";
+	action "kldload if_aue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0557";
+	match "product" "0x2008";
+	action "kldload uplcom";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0557";
+	match "product" "0x2009";
+	action "kldload if_axe";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0557";
+	match "product" "0x4000";
+	action "kldload if_kue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x055d";
+	match "product" "0x2018";
+	action "kldload if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0565";
+	match "product" "0x0001";
+	action "kldload ubsa";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0565";

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-projects mailing list