Regenerate usb.conf .

MFC after:	1 week

1 files changed, 228 insertions, 12 deletions

diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 4f1d92f..56f1a5f 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -169,7 +169,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0409";
-	match "product" "(0x00d5|0x00d6|0x00d7|0x8024|0x8025)";
+	match "product" "(0x00d5|0x00d6|0x00d7)";
+	action "kldload -n uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0409";
+	match "product" "0x0249";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0409";
+	match "product" "(0x8024|0x8025)";
 	action "kldload -n uipaq";
 };
 
@@ -521,6 +537,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bb";
+	match "product" "0x093f";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04bb";
 	match "product" "(0x0944|0x0945|0x0947|0x0948)";
 	action "kldload -n if_run";
 };
@@ -1064,6 +1088,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x057c";
+	match "product" "0x8401";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0584";
 	match "product" "0xb000";
 	action "kldload -n uplcom";
@@ -1089,7 +1121,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0586";
-	match "product" "(0x3416|0x341a|0x341e)";
+	match "product" "0x3416";
+	action "kldload -n if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0586";
+	match "product" "0x3417";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0586";
+	match "product" "(0x341a|0x341e)";
 	action "kldload -n if_run";
 };
 
@@ -1153,7 +1201,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
-	match "product" "(0x0230|0x0231|0x0232|0x0236|0x0237|0x0238|0x023f|0x0240|0x0241|0x0242|0x0243|0x0244|0x0245|0x0246|0x0247|0x0249|0x024a|0x024b|0x024c|0x024d|0x024e|0x0252|0x0253|0x0254|0x0259|0x025a|0x025b|0x0262|0x0263|0x0264|0x0290|0x0291|0x0292)";
+	match "product" "(0x0230|0x0231|0x0232|0x0236|0x0237|0x0238|0x023f|0x0240|0x0241|0x0242|0x0243|0x0244|0x0245|0x0246|0x0247|0x0249|0x024a|0x024b|0x024c|0x024d|0x024e|0x0252|0x0253|0x0254|0x0259|0x025a|0x025b|0x0262|0x0263|0x0264|0x0272|0x0273|0x0274|0x0290|0x0291|0x0292)";
 	action "kldload -n wsp";
 };
 
@@ -1721,6 +1769,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07d1";
+	match "product" "0x3a09";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07d1";
 	match "product" "0x3a0c";
 	action "kldload -n if_uath";
 };
@@ -1729,6 +1785,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07d1";
+	match "product" "0x3a0f";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07d1";
 	match "product" "(0x3c03|0x3c04|0x3c06|0x3c07)";
 	action "kldload -n if_rum";
 };
@@ -1737,7 +1801,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07d1";
-	match "product" "(0x3c09|0x3c0a|0x3c0b|0x3c0d|0x3c0e|0x3c0f|0x3c11|0x3c13|0x3c15|0x3c16)";
+	match "product" "(0x3c09|0x3c0a|0x3c0b|0x3c0d|0x3c0e|0x3c0f)";
+	action "kldload -n if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07d1";
+	match "product" "0x3c10";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07d1";
+	match "product" "(0x3c11|0x3c13|0x3c15|0x3c16)";
 	action "kldload -n if_run";
 };
 
@@ -1848,6 +1928,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x083a";
+	match "product" "0xf522";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0841";
 	match "product" "0x0001";
 	action "kldload -n urio";
@@ -1921,7 +2009,39 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
-	match "product" "(0x9021|0x9041)";
+	match "product" "(0x9001|0x9010)";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "0x9012";
+	action "kldload -n if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "0x9021";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "0x9040";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "0x9041";
 	action "kldload -n if_urtwn";
 };
 
@@ -2184,6 +2304,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0ace";
+	match "product" "0x1221";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701)";
 	action "kldload -n u3g";
@@ -2545,6 +2673,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
+	match "product" "0x8152";
+	action "kldload -n if_ure";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0bda";
 	match "product" "0x8170";
 	action "kldload -n if_urtwn";
 };
@@ -2793,13 +2929,37 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cde";
-	match "product" "(0x0022|0x0025)";
+	match "product" "0x0022";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0cde";
+	match "product" "0x0023";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cde";
+	match "product" "0x0025";
+	action "kldload -n if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cde";
+	match "product" "0x0026";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0cf3";
 	match "product" "(0x0001|0x0003|0x0005)";
 	action "kldload -n if_uath";
@@ -2809,7 +2969,31 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cf3";
-	match "product" "(0x3002|0x3004|0x311d|0xe004|0xe019)";
+	match "product" "(0x1001|0x1002|0x1010|0x1011)";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cf3";
+	match "product" "(0x3002|0x3004|0x311d)";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cf3";
+	match "product" "0x9170";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cf3";
+	match "product" "(0xe004|0xe019)";
 	action "kldload -n ng_ubt";
 };
 
@@ -3529,7 +3713,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
-	match "product" "(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3)";
+	match "product" "(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3)";
 	action "kldload -n u3g";
 };
 
@@ -3545,7 +3729,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
-	match "product" "0x68aa";
+	match "product" "(0x68aa|0x68c0|0x9041)";
 	action "kldload -n u3g";
 };
 
@@ -3657,7 +3841,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
-	match "product" "(0x1803|0x1c05|0x1c0b)";
+	match "product" "(0x1573|0x1803|0x1c05|0x1c0b)";
 	action "kldload -n u3g";
 };
 
@@ -3849,6 +4033,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1435";
+	match "product" "0x0326";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x1435";
 	match "product" "0x0427";
 	action "kldload -n if_upgt";
 };
@@ -3865,6 +4057,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1435";
+	match "product" "0x0804";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x1435";
 	match "product" "(0x0826|0x082a)";
 	action "kldload -n if_uath";
 };
@@ -4529,7 +4729,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x19d2";
-	match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x1179|0x1181|0x1420|0x1514|0x1516|0x2000|0x2002|0x2003|0xffdd|0xffde|0xfff1|0xfff5|0xfffe)";
+	match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0103|0x0117|0x1179|0x1181|0x1420|0x1514|0x1516|0x2000|0x2002|0x2003|0xffdd|0xffde|0xfff1|0xfff5|0xfffe)";
 	action "kldload -n u3g";
 };
 
@@ -4841,6 +5041,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
+	match "product" "0x5304";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x2019";
 	match "product" "0xab01";
 	action "kldload -n if_rum";
 };
@@ -5312,6 +5520,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0xcace";
+	match "product" "0x0300";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0xdaae";
 	match "product" "0xead6";
 	action "kldload -n uslcom";
@@ -5585,5 +5801,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2688 USB entries processed
+# 2719 USB entries processed