Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jun 2011 15:42:33 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r223536 - in head/etc: defaults devd
Message-ID:  <201106251542.p5PFgX22012838@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Sat Jun 25 15:42:33 2011
New Revision: 223536
URL: http://svn.freebsd.org/changeset/base/223536

Log:
  - Move auto-load devd config file into etc/defaults folder.
  - Regenerate file after bugfix in the generator.
  
  Suggested by:	Jeremy Messenger
  MFC after:	14 days

Added:
  head/etc/defaults/devd.conf
     - copied, changed from r223521, head/etc/devd/bus_auto.conf
Deleted:
  head/etc/devd/bus_auto.conf
Modified:
  head/etc/defaults/Makefile

Modified: head/etc/defaults/Makefile
==============================================================================
--- head/etc/defaults/Makefile	Sat Jun 25 15:22:44 2011	(r223535)
+++ head/etc/defaults/Makefile	Sat Jun 25 15:42:33 2011	(r223536)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FILES=	bluetooth.device.conf devfs.rules periodic.conf rc.conf
+FILES=	bluetooth.device.conf devd.conf devfs.rules periodic.conf rc.conf
 NO_OBJ=
 FILESDIR= /etc/defaults
 

Copied and modified: head/etc/defaults/devd.conf (from r223521, head/etc/devd/bus_auto.conf)
==============================================================================
--- head/etc/devd/bus_auto.conf	Fri Jun 24 22:01:56 2011	(r223521, copy source)
+++ head/etc/defaults/devd.conf	Sat Jun 25 15:42:33 2011	(r223536)
@@ -7,32 +7,6 @@
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
-	match "mode" "(host|device)";
-	match "intclass" "0x02";
-	match "intsubclass" "0x06";
-	action "kldload if_cdce";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "(host|device)";
-	match "intclass" "0x02";
-	match "intsubclass" "0x0a";
-	action "kldload if_cdce";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "(host|device)";
-	match "intclass" "0x02";
-	match "intsubclass" "0x0d";
-	action "kldload if_cdce";
-};
-
-# 3 usb_dual entries processed
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
 	match "product" "0x1290";
@@ -111,1253 +85,2549 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
-	match "product" "(0x0121|0x1016|0x1116|0x1216|0x1b1d|0x1e1d|0x2016|0x2116|0x2216|0x3016|0x3116|0x3216|0x3524|0x4016|0x4116|0x4216|0x5016|0x5116|0x5216|0x811c|0xca02)";
+	match "product" "0x0121";
 	action "kldload ugensa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0402";
-	match "product" "0x5632";
-	action "kldload if_cdce";
+	match "vendor" "0x03f0";
+	match "product" "(0x1016|0x1116|0x1216)";
+	action "kldload uipaq";
 };
 
 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";
+	match "vendor" "0x03f0";
+	match "product" "(0x1b1d|0x1e1d)";
+	action "kldload u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0408";
-	match "product" "(0x0304|0x1000|0xea02|0xea03|0xea04|0xea05|0xea06)";
-	action "kldload if_run";
+	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" "0x0409";
-	match "product" "(0x00d5|0x00d6|0x00d7|0x8024|0x8025)";
-	action "kldload uipaq";
+	match "vendor" "0x03f0";
+	match "product" "0x3524";
+	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0411";
-	match "product" "(0x0001|0x0005|0x0009|0x0012|0x003d|0x005e|0x0066|0x0067|0x006e|0x008b|0x00b3|0x00d8|0x00d9|0x00da|0x00e8|0x0116|0x0119|0x012e|0x0137|0x0148|0x0150|0x015d|0x016f)";
-	action "kldload if_aue";
+	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" "0x0413";
-	match "product" "0x2101";
-	action "kldload uplcom";
+	match "vendor" "0x03f0";
+	match "product" "0x811c";
+	action "kldload if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0423";
-	match "product" "(0x000a|0x000c)";
-	action "kldload if_cue";
+	match "vendor" "0x03f0";
+	match "product" "0xca02";
+	action "kldload if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x043e";
-	match "product" "0x9c01";
-	action "kldload uipaq";
+	match "vendor" "0x0402";
+	match "product" "0x5632";
+	action "kldload if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x045a";
-	match "product" "(0x5001|0x5002)";
-	action "kldload urio";
+	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" "0x045b";
-	match "product" "0x0053";
-	action "kldload uslcom";
+	match "vendor" "0x0408";
+	match "product" "0x0304";
+	action "kldload if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x045e";
-	match "product" "(0x0079|0x007a|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 uplcom";
+	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" "0x0471";
-	match "product" "(0x066a|0x1236|0x200f)";
-	action "kldload uslcom";
+	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" "0x0482";
-	match "product" "0x0203";
-	action "kldload umodem";
+	match "vendor" "0x0411";
+	match "product" "(0x0001|0x0005|0x0009)";
+	action "kldload if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0489";
-	match "product" "(0xe000|0xe003)";
-	action "kldload uslcom";
+	match "vendor" "0x0411";
+	match "product" "0x0012";
+	action "kldload if_rue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x049f";
-	match "product" "(0x0003|0x0032|0x505a)";
-	action "kldload uipaq";
+	match "vendor" "0x0411";
+	match "product" "0x003d";
+	action "kldload if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04a4";
-	match "product" "0x0014";
-	action "kldload uipaq";
+	match "vendor" "0x0411";
+	match "product" "(0x005e|0x0066|0x0067)";
+	action "kldload if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04a5";
-	match "product" "(0x4027|0x4068)";
-	action "kldload uplcom";
+	match "vendor" "0x0411";
+	match "product" "0x006e";
+	action "kldload if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04ad";
-	match "product" "(0x0301|0x0302|0x0303|0x0306)";
-	action "kldload uipaq";
+	match "vendor" "0x0411";
+	match "product" "0x008b";
+	action "kldload if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04b4";
-	match "product" "0x1002";
-	action "kldload ufm";
+	match "vendor" "0x0411";
+	match "product" "0x00b3";
+	action "kldload uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04b7";
-	match "product" "0x0531";
-	action "kldload uipaq";
+	match "vendor" "0x0411";
+	match "product" "(0x00d8|0x00d9)";
+	action "kldload if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04b8";
-	match "product" "(0x0521|0x0522)";
-	action "kldload uplcom";
+	match "vendor" "0x0411";
+	match "product" "0x00da";
+	action "kldload if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04bb";
-	match "product" "(0x0901|0x0904|0x0913|0x0930|0x0944|0x0945|0x0947|0x0948|0x0a03|0x0a0e)";
-	action "kldload if_kue";
+	match "vendor" "0x0411";
+	match "product" "0x00e8";
+	action "kldload if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04bf";
-	match "product" "(0x0115|0x0117)";
-	action "kldload uplcom";
+	match "vendor" "0x0411";
+	match "product" "(0x0116|0x0119)";
+	action "kldload if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04c5";
-	match "product" "(0x1058|0x1079)";
-	action "kldload uipaq";
+	match "vendor" "0x0411";
+	match "product" "0x012e";
+	action "kldload if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04da";
-	match "product" "(0x2500|0x3900)";
-	action "kldload uipaq";
+	match "vendor" "0x0411";
+	match "product" "0x0137";
+	action "kldload if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04dd";
-	match "product" "(0x8004|0x8005|0x8006|0x8007|0x9031|0x9102|0x9121|0x9123|0x9151|0x91ac|0x9242)";
-	action "kldload if_cdce";
+	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" "0x04e8";
-	match "product" "(0x5f00|0x5f01|0x5f02|0x5f03|0x5f04|0x6601|0x6611|0x6613|0x6615|0x6617|0x6619|0x661b|0x662e|0x6630|0x6632|0x8001)";
-	action "kldload uipaq";
+	match "vendor" "0x0413";
+	match "product" "0x2101";
+	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x04f1";
-	match "product" "(0x3008|0x3011|0x3012)";
-	action "kldload if_axe";
+	match "vendor" "0x0423";
+	match "product" "(0x000a|0x000c)";
+	action "kldload if_cue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0502";
-	match "product" "(0x1631|0x1632|0x16e1|0x16e2|0x16e3)";
+	match "vendor" "0x043e";
+	match "product" "0x9c01";
 	action "kldload uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0506";
-	match "product" "(0x03e8|0x11f8|0x4601)";
-	action "kldload if_kue";
+	match "vendor" "0x045a";
+	match "product" "(0x5001|0x5002)";
+	action "kldload urio";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x050d";
-	match "product" "(0x0103|0x0109|0x0121|0x0257|0x0409|0x1203|0x4050|0x5055|0x7050|0x7050|0x7051|0x705a|0x705c|0x705e|0x8053|0x805c|0x815c|0x825a|0x905b|0x935a)";
-	action "kldload ubsa";
+	match "vendor" "0x045b";
+	match "product" "0x0053";
+	action "kldload uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0525";
-	match "product" "(0x1080|0xa4a2)";
-	action "kldload udbp";
+	match "vendor" "0x045e";
+	match "product" "0x0079";
+	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0536";
-	match "product" "0x01a0";
-	action "kldload uipaq";
+	match "vendor" "0x045e";
+	match "product" "0x007a";
+	action "kldload if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0543";
-	match "product" "(0x0ed9|0x1527|0x1529|0x152b|0x152e|0x1921|0x1922|0x1923)";
+	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" "0x0547";
-	match "product" "(0x2008|0x2720)";
-	action "kldload uplcom";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "host";
-	match "vendor" "0x054c";
-	match "product" "(0x0038|0x0066|0x0095|0x009a|0x00da|0x0169|0x0437)";
-	action "kldload uvisor";
+	match "vendor" "0x0471";
+	match "product" "0x066a";
+	action "kldload uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0557";
-	match "product" "(0x2002|0x2007|0x2008|0x2009|0x4000)";
-	action "kldload if_kue";
+	match "vendor" "0x0471";
+	match "product" "0x1236";
+	action "kldload if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x055d";
-	match "product" "0x2018";
+	match "vendor" "0x0471";
+	match "product" "0x200f";
 	action "kldload if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0565";
-	match "product" "(0x0001|0x0002|0x0003|0x0005)";
-	action "kldload ubsa";
+	match "vendor" "0x0482";
+	match "product" "0x0203";
+	action "kldload umodem";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0567";
-	match "product" "(0x2000|0x2002)";
-	action "kldload if_upgt";
+	match "vendor" "0x0489";
+	match "product" "(0xe000|0xe003)";
+	action "kldload uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x056c";
-	match "product" "0x8007";
-	action "kldload ubsa";
+	match "vendor" "0x049f";
+	match "product" "(0x0003|0x0032)";
+	action "kldload uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x056e";
-	match "product" "(0x200c|0x4002|0x4005|0x400b|0x4010|0x5003|0x5004|0xabc1)";
-	action "kldload if_aue";
+	match "vendor" "0x049f";
+	match "product" "0x505a";
+	action "kldload if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x057c";
-	match "product" "(0x2200|0x3800)";
-	action "kldload ng_ubt";
+	match "vendor" "0x04a4";
+	match "product" "0x0014";
+	action "kldload uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0584";
-	match "product" "(0xb000|0xb020)";
+	match "vendor" "0x04a5";
+	match "product" "0x4027";
 	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0586";
-	match "product" "(0x3401|0x3407|0x3409|0x340a|0x340f|0x3410|0x3416|0x341a)";
-	action "kldload if_zyd";
+	match "vendor" "0x04a5";
+	match "product" "0x4068";
+	action "kldload u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x058f";
-	match "product" "0x9720";
-	action "kldload uplcom";
+	match "vendor" "0x04ad";
+	match "product" "(0x0301|0x0302|0x0303|0x0306)";
+	action "kldload uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x05a6";
-	match "product" "0x0101";
-	action "kldload if_run";
+	match "vendor" "0x04b4";
+	match "product" "0x1002";
+	action "kldload ufm";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x05ac";
-	match "product" "(0x020d|0x020e|0x020f|0x0215|0x0217|0x0218|0x0219|0x021a|0x021b|0x021c|0x0229|0x022a|0x022b|0x030a|0x030b|0x1402)";
-	action "kldload atp";
+	match "vendor" "0x04b7";
+	match "product" "0x0531";
+	action "kldload uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x05ad";
-	match "product" "0x0fba";
+	match "vendor" "0x04b8";
+	match "product" "(0x0521|0x0522)";
 	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x05c6";
-	match "product" "(0x6000|0x6613)";
-	action "kldload u3g";
+	match "vendor" "0x04bb";
+	match "product" "0x0901";
+	action "kldload if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x05cc";
-	match "product" "0x3000";
+	match "vendor" "0x04bb";
+	match "product" "(0x0904|0x0913)";
 	action "kldload if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x05db";
-	match "product" "(0x0003|0x0005|0x0009|0x000a|0x0011)";
-	action "kldload uvscom";
+	match "vendor" "0x04bb";
+	match "product" "0x0930";
+	action "kldload if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x05e0";
-	match "product" "(0x2000|0x2001|0x2002|0x2003|0x2004|0x2005|0x2006|0x2007|0x2008|0x2009|0x200a)";
-	action "kldload uipaq";
+	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" "0x05e3";
-	match "product" "0x0501";
-	action "kldload udbp";
+	match "vendor" "0x04bb";
+	match "product" "(0x0a03|0x0a0e)";
+	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x05e9";
-	match "product" "(0x0008|0x0009)";
-	action "kldload if_kue";
+	match "vendor" "0x04bf";
+	match "product" "(0x0115|0x0117)";
+	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x066b";
-	match "product" "(0x200c|0x2202|0x2202|0x2203|0x2204|0x2206|0x400b)";
-	action "kldload if_aue";
+	match "vendor" "0x04c5";
+	match "product" "(0x1058|0x1079)";
+	action "kldload uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0675";
-	match "product" "0x0550";
-	action "kldload if_zyd";
+	match "vendor" "0x04da";
+	match "product" "0x2500";
+	action "kldload uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x067b";
-	match "product" "(0x0000|0x0001|0x04bb|0x0609|0x0611|0x0612|0x1234|0x206a|0x2303|0x2501|0x331a|0xaaa0|0xaaa2)";
-	action "kldload udbp";
+	match "vendor" "0x04da";
+	match "product" "0x3900";
+	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x067c";
-	match "product" "0x1001";
-	action "kldload if_aue";
+	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" "0x067e";
-	match "product" "0x1001";
+	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" "0x0681";
-	match "product" "0x3c06";
-	action "kldload if_ural";
+	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" "0x06e1";
-	match "product" "(0x0008|0x0009)";
-	action "kldload if_kue";
+	match "vendor" "0x04e8";
+	match "product" "0x6601";
+	action "kldload uvisor";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x06f8";
-	match "product" "(0xe000|0xe010|0xe020|0xe030)";
-	action "kldload if_ural";
+	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" "0x0707";
-	match "product" "(0x0100|0x0200|0x0201|0xee13|0xee13)";
-	action "kldload if_kue";
+	match "vendor" "0x04e8";
+	match "product" "0x8001";
+	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0711";
-	match "product" "(0x0200|0x0210|0x0230)";
-	action "kldload umct";
+	match "vendor" "0x04f1";
+	match "product" "0x3008";
+	action "kldload if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0731";
-	match "product" "(0x0528|0x2003)";
-	action "kldload uplcom";
+	match "vendor" "0x04f1";
+	match "product" "(0x3011|0x3012)";
+	action "kldload uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0745";
-	match "product" "(0x0001|0x1000)";
-	action "kldload uplcom";
+	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" "0x0769";
-	match "product" "(0x11f2|0x11f3|0x31f3)";
-	action "kldload if_urtw";
+	match "vendor" "0x0506";
+	match "product" "(0x03e8|0x11f8)";
+	action "kldload if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x077b";
-	match "product" "0x2226";
-	action "kldload if_axe";
+	match "vendor" "0x0506";
+	match "product" "0x4601";
+	action "kldload if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0789";
-	match "product" "(0x010c|0x0160|0x0162|0x0163|0x0164)";
-	action "kldload if_urtw";
+	match "vendor" "0x050d";
+	match "product" "0x0103";
+	action "kldload ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x078b";
-	match "product" "0x1234";
-	action "kldload uplcom";
+	match "vendor" "0x050d";
+	match "product" "0x0109";
+	action "kldload umct";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x079b";
-	match "product" "(0x0027|0x004a|0x0062)";
-	action "kldload uplcom";
+	match "vendor" "0x050d";
+	match "product" "0x0121";
+	action "kldload if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x07a6";
-	match "product" "(0x07c2|0x0986|0x8511|0x8513|0x8515)";
-	action "kldload if_aue";
+	match "vendor" "0x050d";
+	match "product" "0x0257";
+	action "kldload uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x07aa";
-	match "product" "(0x0001|0x0004|0x000d|0x0017|0x002a|0x002d|0x002e|0x002f|0x003c|0x003f|0x0041|0x0042|0x9601)";
-	action "kldload if_kue";
+	match "vendor" "0x050d";
+	match "product" "0x0409";
+	action "kldload umct";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x07b8";
-	match "product" "(0x110c|0x200c|0x2770|0x2870|0x3070|0x3071|0x3072|0x4000|0x4002|0x4003|0x4004|0x4007|0x400b|0x400c|0x4102|0x4104|0x420a|0x6001|0xabc1|0xb21b|0xb21c|0xb21d|0xb21e|0xb21f)";
-	action "kldload if_aue";
+	match "vendor" "0x050d";
+	match "product" "0x1203";
+	action "kldload ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x07c9";
-	match "product" "0xb100";
-	action "kldload if_aue";
+	match "vendor" "0x050d";
+	match "product" "0x4050";
+	action "kldload if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x07cf";
-	match "product" "(0x2001|0x2002|0x2003)";
-	action "kldload uipaq";
+	match "vendor" "0x050d";
+	match "product" "0x5055";
+	action "kldload if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x07d1";
-	match "product" "(0x3a0c|0x3c03|0x3c04|0x3c06|0x3c07|0x3c09|0x3c0a|0x3c0b|0x3c0d|0x3c0e|0x3c0f|0x3c11|0x3c13|0x3c15|0x3c16)";
-	action "kldload if_uath";
+	match "vendor" "0x050d";
+	match "product" "0x7050";
+	action "kldload if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x081e";
-	match "product" "0xdf00";
-	action "kldload uvisor";
+	match "vendor" "0x050d";
+	match "product" "(0x7050|0x7051)";
+	action "kldload if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x082d";
-	match "product" "(0x0100|0x0200|0x0300)";
-	action "kldload uvisor";
+	match "vendor" "0x050d";
+	match "product" "0x705a";
+	action "kldload if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0830";
-	match "product" "(0x0001|0x0002|0x0003|0x0020|0x0031|0x0040|0x0050|0x0060|0x0061|0x0070)";
-	action "kldload uvisor";
+	match "vendor" "0x050d";
+	match "product" "0x705c";
+	action "kldload if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0833";
-	match "product" "(0x012e|0x039f)";
-	action "kldload uplcom";
+	match "vendor" "0x050d";
+	match "product" "0x705e";
+	action "kldload if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x083a";
-	match "product" "(0x1046|0x4506|0x4506|0x4508|0x4521|0x5046|0x6618|0x7511|0x7512|0x7522|0x8522|0xa512|0xa618|0xa701|0xa702|0xb522|0xc522|0xd522|0xe501)";
-	action "kldload if_aue";
+	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" "0x0841";
-	match "product" "0x0001";
-	action "kldload urio";
+	match "vendor" "0x050d";
+	match "product" "0x905b";
+	action "kldload if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0846";
-	match "product" "(0x1001|0x1002|0x1020|0x1040|0x4240|0x4260|0x4300|0x6100|0x6a00)";
-	action "kldload if_kue";
+	match "vendor" "0x050d";
+	match "product" "0x935a";
+	action "kldload if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x0856";
-	match "product" "0xac01";
-	action "kldload uftdi";
+	match "vendor" "0x0525";
+	match "product" "0x1080";
+	action "kldload udbp";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "vendor" "0x085a";
-	match "product" "(0x0008|0x0009)";
-	action "kldload if_kue";
+	match "vendor" "0x0525";
+	match "product" "0xa4a2";
+	action "kldload if_cdce";
 };

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106251542.p5PFgX22012838>