Regenerate usb.conf

MFC after:	1 week

1 files changed, 27 insertions, 67 deletions

diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 9aaa636..577fc64 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -8,72 +8,6 @@
 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 -n 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 -n 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 -n 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 -n if_ipheth";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "host";
-	match "vendor" "0x05ac";
-	match "product" "0x12a0";
-	match "intclass" "0xff";
-	match "intsubclass" "0xfd";
-	match "intprotocol" "0x01";
-	action "kldload -n if_ipheth";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "host";
-	match "vendor" "0x05ac";
-	match "product" "0x12a8";
-	match "intclass" "0xff";
-	match "intsubclass" "0xfd";
-	match "intprotocol" "0x01";
-	action "kldload -n if_ipheth";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "host";
 	match "vendor" "0x0104";
 	match "product" "0x00be";
 	action "kldload -n uipaq";
@@ -2938,6 +2872,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x1004";
+	match "product" "0x618f";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x100d";
 	match "product" "(0x9031|0x9032)";
 	action "kldload -n if_run";
@@ -4042,6 +3984,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x17ef";
+	match "product" "0x7203";
+	action "kldload -n if_axe";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x17f4";
 	match "product" "0xaaaa";
 	action "kldload -n uslcom";
@@ -4826,6 +4776,16 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x05ac";
+	match "intclass" "0xff";
+	match "intsubclass" "0xfd";
+	match "intprotocol" "0x01";
+	action "kldload -n if_ipheth";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0a5c";
 	match "intclass" "0xff";
 	match "intsubclass" "0x01";
@@ -4976,5 +4936,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2480 USB entries processed
+# 2477 USB entries processed