Index: stable/10/etc/devd/usb.conf
===================================================================
--- stable/10/etc/devd/usb.conf	(revision 276242)
+++ stable/10/etc/devd/usb.conf	(revision 276243)
@@ -1,5505 +1,5556 @@
 #
 # $FreeBSD$
 #
 # This file was automatically generated by "tools/tools/bus_autoconf/bus_autoconf.sh".
 # Please do not edit!
 #
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0104";
 	match "product" "0x00be";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0123";
 	match "product" "0x0001";
 	action "kldload -n uep";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03e8";
 	match "product" "0x0008";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03eb";
 	match "product" "0x2109";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "0x0121";
 	action "kldload -n ugensa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "(0x1016|0x1116|0x1216)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "(0x1b1d|0x1e1d)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "(0x2016|0x2116|0x2216)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "(0x241d|0x251d)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "(0x3016|0x3116)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "0x311d";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "0x3216";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "0x3524";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "(0x4016|0x4116|0x4216|0x5016|0x5116|0x5216)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "0x811c";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
 	match "product" "0xca02";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0402";
 	match "product" "0x5632";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0403";
 	match "product" "(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0408";
 	match "product" "0x0304";
 	action "kldload -n 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 -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0409";
 	match "product" "(0x00d5|0x00d6|0x00d7|0x8024|0x8025)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "(0x0001|0x0005|0x0009)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "0x0012";
 	action "kldload -n if_rue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "0x003d";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "(0x005e|0x0066|0x0067)";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "0x006e";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "0x008b";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "0x00b3";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "(0x00d8|0x00d9)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "0x00da";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "0x00e8";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "(0x00f4|0x0116|0x0119)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "0x012e";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "0x0137";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
 	match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2|0x01ee)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0413";
 	match "product" "0x2101";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0423";
 	match "product" "(0x000a|0x000c)";
 	action "kldload -n if_cue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x043e";
 	match "product" "0x9c01";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x044e";
 	match "product" "(0x3001|0x3002)";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0456";
 	match "product" "(0xf000|0xf001)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x045a";
 	match "product" "(0x5001|0x5002)";
 	action "kldload -n urio";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x045b";
 	match "product" "0x0053";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x045e";
 	match "product" "0x0079";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x045e";
 	match "product" "0x007a";
 	action "kldload -n 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 -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0471";
 	match "product" "0x066a";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0471";
 	match "product" "0x1236";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0471";
 	match "product" "0x200f";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0482";
 	match "product" "0x0203";
 	action "kldload -n umodem";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0489";
 	match "product" "(0xe000|0xe003)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0489";
 	match "product" "(0xe027|0xe02c|0xe036|0xe03c|0xe03d|0xe042|0xe04e|0xe056|0xe057)";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0499";
 	match "product" "(0x1000|0x1001|0x1002|0x1003|0x1004|0x1005|0x1006|0x1007|0x1008|0x1009|0x100a|0x100c|0x100d|0x100e|0x100f|0x1010|0x1011|0x1012|0x1013|0x1014|0x1015|0x1016|0x1017|0x1018|0x1019|0x101a|0x101b|0x101c|0x101d|0x101e|0x101f|0x1020|0x1021|0x1022|0x1023|0x1024|0x1025|0x1026|0x1027|0x1028|0x1029|0x102a|0x102b|0x102e|0x1030|0x1031|0x1032|0x1033|0x1034|0x1035|0x1036|0x1037|0x1038|0x1039|0x103a|0x103b|0x103c|0x103d|0x103e|0x103f|0x1040|0x1041|0x1042|0x1043|0x1044|0x1045|0x104e|0x104f|0x1050|0x1051|0x1052|0x1053|0x1054|0x1055|0x1056|0x1057|0x1058|0x1059|0x105a|0x105b|0x105c|0x105d|0x1503|0x2000|0x2001|0x2002|0x2003|0x5000|0x5001|0x5002|0x5003|0x5004|0x5005|0x5006|0x5007|0x5008|0x5009|0x500a|0x500b|0x500c|0x500d|0x500e|0x500f|0x7000|0x7010)";
 	action "kldload -n snd_uaudio";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x049f";
 	match "product" "(0x0003|0x0032)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x049f";
 	match "product" "0x505a";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04a4";
 	match "product" "0x0014";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04a5";
 	match "product" "0x4027";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04a5";
 	match "product" "0x4068";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04ad";
 	match "product" "(0x0301|0x0302|0x0303|0x0306)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04b4";
 	match "product" "0x1002";
 	action "kldload -n ufm";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04b7";
 	match "product" "0x0531";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04b8";
 	match "product" "(0x0521|0x0522)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bb";
 	match "product" "0x0901";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bb";
 	match "product" "(0x0904|0x0913)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bb";
 	match "product" "0x0930";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bb";
 	match "product" "(0x0944|0x0945|0x0947|0x0948)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bb";
 	match "product" "(0x0a03|0x0a0e)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bf";
 	match "product" "(0x0115|0x0117)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bf";
 	match "product" "0x030a";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04c5";
 	match "product" "(0x1058|0x1079)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04ca";
 	match "product" "(0x2003|0x3005|0x3006|0x3008)";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04da";
 	match "product" "0x2500";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04da";
 	match "product" "0x3900";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04dd";
 	match "product" "(0x8004|0x8005|0x8006|0x8007|0x9031)";
 	action "kldload -n 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 -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04e8";
 	match "product" "0x2018";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04e8";
 	match "product" "(0x5f00|0x5f01|0x5f02|0x5f03|0x5f04)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04e8";
 	match "product" "0x6601";
 	action "kldload -n 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 -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04e8";
 	match "product" "0x8001";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04f1";
 	match "product" "0x3008";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04f1";
 	match "product" "(0x3011|0x3012)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04f2";
 	match "product" "(0xaff7|0xaff8|0xaff9|0xaffa|0xaffa)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0502";
 	match "product" "(0x1631|0x1632|0x16e1|0x16e2|0x16e3)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0506";
 	match "product" "(0x03e8|0x11f8)";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0506";
 	match "product" "0x4601";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x0103";
 	action "kldload -n ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x0109";
 	action "kldload -n umct";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x0121";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x0257";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x0409";
 	action "kldload -n umct";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x1102";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x1103";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x1203";
 	action "kldload -n ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "(0x2102|0x2103)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x4050";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x5055";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x7050";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "(0x7050|0x7051)";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x705a";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x705c";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x705e";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "(0x8053|0x805c|0x815c)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x815f";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "(0x825a|0x825b)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x845a";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x905b";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "(0x935a|0x935b)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x945a";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0525";
 	match "product" "(0x1080|0xa4a0)";
 	action "kldload -n udbp";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0525";
 	match "product" "0xa4a2";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0536";
 	match "product" "0x01a0";
 	action "kldload -n 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 -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0547";
 	match "product" "0x2008";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0547";
 	match "product" "0x2720";
 	action "kldload -n udbp";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x054c";
 	match "product" "(0x0038|0x0066|0x0095|0x009a|0x00da|0x0169)";
 	action "kldload -n uvisor";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x054c";
 	match "product" "0x0437";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0557";
 	match "product" "0x2002";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0557";
 	match "product" "0x2007";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0557";
 	match "product" "0x2008";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0557";
 	match "product" "0x2009";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0557";
 	match "product" "0x4000";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x055d";
 	match "product" "0x2018";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0565";
 	match "product" "0x0001";
 	action "kldload -n ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0565";
 	match "product" "(0x0002|0x0003|0x0005)";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0567";
 	match "product" "(0x2000|0x2002)";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x056c";
 	match "product" "0x8007";
 	action "kldload -n ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x056e";
-	match "product" "(0x200c|0x4002|0x4005|0x400b|0x4010)";
+	match "product" "(0x200c|0x4002|0x4005)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x056e";
+	match "product" "0x4008";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x056e";
+	match "product" "(0x400b|0x4010)";
+	action "kldload -n if_aue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x056e";
 	match "product" "(0x5003|0x5004)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x056e";
 	match "product" "0xabc1";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x057c";
 	match "product" "(0x2200|0x3800)";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0584";
 	match "product" "0xb000";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0584";
 	match "product" "0xb020";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0586";
 	match "product" "(0x3401|0x3407|0x3409|0x340a|0x340f|0x3410)";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0586";
 	match "product" "(0x3416|0x341a|0x341e)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0586";
 	match "product" "0x341f";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0586";
 	match "product" "0x3421";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x058f";
 	match "product" "0x9720";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05a6";
 	match "product" "0x0101";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
 	match "product" "(0x020d|0x020e|0x020f|0x0210|0x0214|0x0215|0x0216|0x0217|0x0218|0x0219|0x021a|0x021b|0x021c)";
 	action "kldload -n atp";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
 	match "product" "(0x0223|0x0224|0x0225)";
 	action "kldload -n wsp";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
 	match "product" "(0x0229|0x022a|0x022b)";
 	action "kldload -n atp";
 };
 
 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)";
 	action "kldload -n wsp";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
 	match "product" "(0x030a|0x030b)";
 	action "kldload -n atp";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
 	match "product" "0x1402";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
 	match "product" "(0x8213|0x8215|0x8218|0x821a|0x821b|0x821f|0x8281|0x828f)";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ad";
 	match "product" "0x0fba";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05c6";
-	match "product" "(0x1000|0x6000|0x6613|0x9000|0x9204|0x9205)";
+	match "product" "(0x1000|0x6000|0x6500|0x6613|0x9000|0x9204|0x9205)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05cc";
 	match "product" "0x3000";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05db";
 	match "product" "(0x0003|0x0005|0x0009|0x000a|0x0011)";
 	action "kldload -n uvscom";
 };
 
 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 -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05e3";
 	match "product" "0x0501";
 	action "kldload -n udbp";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05e9";
 	match "product" "(0x0008|0x0009)";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0647";
 	match "product" "0x0100";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x065a";
 	match "product" "(0xc000|0xc001)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x066b";
 	match "product" "(0x200c|0x2202)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x066b";
 	match "product" "0x2202";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x066b";
 	match "product" "(0x2203|0x2204|0x2206|0x400b)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0675";
 	match "product" "0x0550";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x067b";
 	match "product" "(0x0000|0x0001)";
 	action "kldload -n udbp";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x067b";
 	match "product" "(0x0307|0x04bb|0x0609|0x0611|0x0612|0x1234|0x206a|0x2303)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x067b";
 	match "product" "0x2501";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x067b";
 	match "product" "(0x331a|0xaaa0|0xaaa2)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x067c";
 	match "product" "0x1001";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x067e";
 	match "product" "0x1001";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0681";
 	match "product" "0x3c06";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x06ce";
 	match "product" "0x8311";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x06e1";
 	match "product" "(0x0008|0x0009)";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x06f8";
 	match "product" "0xe000";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x06f8";
 	match "product" "(0xe010|0xe020)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x06f8";
 	match "product" "0xe030";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x06f8";
 	match "product" "(0xe031|0xe032)";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x06f8";
 	match "product" "0xe033";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0707";
 	match "product" "0x0100";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0707";
 	match "product" "(0x0200|0x0201)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0707";
 	match "product" "0xee13";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0707";
 	match "product" "0xee13";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0711";
 	match "product" "(0x0200|0x0210|0x0230)";
 	action "kldload -n umct";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0731";
 	match "product" "(0x0528|0x2003)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0745";
 	match "product" "0x0001";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0745";
 	match "product" "0x1000";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0769";
 	match "product" "0x11f2";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0769";
 	match "product" "0x11f3";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0769";
 	match "product" "0x31f3";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x077b";
 	match "product" "0x2226";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0789";
 	match "product" "0x010c";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0789";
 	match "product" "0x0160";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0789";
 	match "product" "(0x0162|0x0163|0x0164|0x0166|0x0168|0x0169)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x078b";
 	match "product" "0x1234";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x079b";
 	match "product" "0x0027";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x079b";
 	match "product" "(0x004a|0x0062)";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07a6";
 	match "product" "(0x07c2|0x0986|0x8511|0x8513|0x8515)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "0x0001";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "(0x0004|0x000d)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "0x0017";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "0x002a";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "(0x002d|0x002e)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "(0x002f|0x003c|0x003f|0x0041|0x0042)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "0x0047";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "0x0056";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "0x9601";
 	action "kldload -n if_udav";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "(0x110c|0x200c)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "(0x2770|0x2870|0x3070|0x3071|0x3072)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "0x4000";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "(0x4002|0x4003|0x4004|0x4007|0x400b|0x400c|0x4102|0x4104)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "0x420a";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "0x6001";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "(0x8178|0x8188|0x8189)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "0xabc1";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "(0xb21b|0xb21c|0xb21d|0xb21e|0xb21f)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07c9";
 	match "product" "0xb100";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07cf";
 	match "product" "(0x2001|0x2002|0x2003)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07d1";
 	match "product" "(0x3300|0x3302|0x3303)";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07d1";
 	match "product" "0x3a0c";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07d1";
 	match "product" "(0x3c03|0x3c04|0x3c06|0x3c07)";
 	action "kldload -n if_rum";
 };
 
 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)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x081e";
 	match "product" "0xdf00";
 	action "kldload -n uvisor";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x082d";
 	match "product" "(0x0100|0x0200|0x0300)";
 	action "kldload -n uvisor";
 };
 
 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 -n uvisor";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0833";
 	match "product" "(0x012e|0x039f)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
 	match "product" "0x1046";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
 	match "product" "(0x4505|0x4506)";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
 	match "product" "0x4508";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
 	match "product" "0x4521";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
 	match "product" "0x5046";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
 	match "product" "(0x6618|0x7511|0x7512|0x7522|0x8522|0xa512|0xa618|0xa701|0xa702|0xb522)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
 	match "product" "0xc512";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
 	match "product" "(0xc522|0xd522)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x083a";
 	match "product" "0xe501";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0841";
 	match "product" "0x0001";
 	action "kldload -n urio";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "(0x1001|0x1002)";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "0x1020";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "0x1040";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "0x1100";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "0x4240";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "0x4260";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "0x4300";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "(0x6100|0x6a00)";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "(0x9021|0x9041)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0856";
 	match "product" "(0xac01|0xac02|0xac03|0xac11|0xac12|0xac16|0xac17|0xac18|0xac19|0xac25|0xac26|0xac27|0xac33|0xac34|0xac49|0xac50|0xba02)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x085a";
 	match "product" "(0x0008|0x0009)";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x086e";
 	match "product" "0x1920";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x087d";
 	match "product" "0x5704";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x08d1";
 	match "product" "0x0001";
 	action "kldload -n if_cue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x08d1";
 	match "product" "0x0003";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x08dd";
 	match "product" "(0x0986|0x0987|0x0988|0x8511)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x08dd";
 	match "product" "0x90ff";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x08e6";
 	match "product" "0x5501";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x08fd";
 	match "product" "0x000a";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0915";
 	match "product" "(0x2000|0x2002)";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x091e";
 	match "product" "0x0004";
 	action "kldload -n uvisor";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0921";
 	match "product" "0x1001";
 	action "kldload -n ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0930";
 	match "product" "(0x0215|0x0219)";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0930";
 	match "product" "(0x0700|0x0705|0x0706|0x0707|0x0708|0x0709|0x070a|0x070b)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0930";
 	match "product" "0x0a07";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0930";
 	match "product" "(0x0d45|0x1302)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x093c";
 	match "product" "(0x0601|0x0701)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x094b";
 	match "product" "0x0001";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0951";
 	match "product" "0x0008";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0951";
 	match "product" "0x000a";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x095a";
 	match "product" "0x3003";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0960";
 	match "product" "(0x0065|0x0066|0x0067)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0961";
 	match "product" "0x0010";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x099e";
 	match "product" "(0x0052|0x4000)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x09aa";
 	match "product" "0x1000";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x09d7";
 	match "product" "0x0100";
 	action "kldload -n ugensa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0a46";
 	match "product" "(0x0268|0x8515|0x9601)";
 	action "kldload -n if_udav";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0a5c";
 	match "product" "0x2033";
 	action "kldload -n ubtbcmfw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0a5c";
 	match "product" "0x21e1";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0acd";
 	match "product" "0x0300";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0ace";
 	match "product" "(0x1211|0x1215)";
 	action "kldload -n if_zyd";
 };
 
 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";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "0x6711";
 	action "kldload -n uhso";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "(0x6721|0x6741|0x6761|0x6800|0x6901)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "0x6911";
 	action "kldload -n uhso";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "0x6971";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "0x6971";
 	action "kldload -n uhso";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "0x7001";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "0x7011";
 	action "kldload -n uhso";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "(0x7021|0x7041|0x7061|0x7100|0x7201|0x7211)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "(0x7251|0x7301|0x7361|0x7381|0x7401|0x7501)";
 	action "kldload -n uhso";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "0x7601";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "(0x7601|0x9000|0xc031|0xd013|0xd031)";
 	action "kldload -n uhso";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "0xd033";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "(0xd033|0xd055|0xd055)";
 	action "kldload -n uhso";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "(0x1706|0x1707)";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "(0x170c|0x171b)";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x171d";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "(0x1723|0x1724)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "(0x1731|0x1732|0x1742|0x1760|0x1761|0x1784)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x1786";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x1790";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x1791";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x179d";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x17ab";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x17ad";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x17b5";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x17ba";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x17cb";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "(0x4200|0x4201|0x4202|0x420f|0x9200|0x9202)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b39";
 	match "product" "0x0103";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b39";
 	match "product" "0x0109";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b39";
 	match "product" "0x0421";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b3b";
 	match "product" "(0x1630|0x5630|0x6630)";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b41";
 	match "product" "0x0011";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b63";
 	match "product" "0x6530";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b8c";
 	match "product" "0x2303";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b95";
 	match "product" "(0x1720|0x1780)";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b95";
 	match "product" "(0x178a|0x1790)";
 	action "kldload -n if_axge";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b95";
 	match "product" "(0x7720|0x772a|0x772b|0x7e2b)";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0baf";
 	match "product" "0x0118";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0baf";
 	match "product" "0x0121";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bb2";
 	match "product" "0x6098";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bb4";
 	match "product" "(0x00ce|0x00cf|0x00cf|0x0a01|0x0a02|0x0a03|0x0a04|0x0a05|0x0a06|0x0a07|0x0a08|0x0a09|0x0a0a|0x0a0b|0x0a0c|0x0a0d|0x0a0e|0x0a0f|0x0a10|0x0a11|0x0a12|0x0a13|0x0a14|0x0a15|0x0a16|0x0a17|0x0a18|0x0a19|0x0a1a|0x0a1b|0x0a1c|0x0a1d|0x0a1e|0x0a1f|0x0a20|0x0a21|0x0a22|0x0a23|0x0a24|0x0a25|0x0a26|0x0a27|0x0a28|0x0a29|0x0a2a|0x0a2b|0x0a2c|0x0a2d|0x0a2e|0x0a2f|0x0a30|0x0a31|0x0a32|0x0a33|0x0a34|0x0a35|0x0a36|0x0a37|0x0a38|0x0a39|0x0a3a|0x0a3b|0x0a3c|0x0a3d|0x0a3e|0x0a3f|0x0a40|0x0a41|0x0a42|0x0a43|0x0a44|0x0a45|0x0a46|0x0a47|0x0a48|0x0a49|0x0a4a|0x0a4b|0x0a4c|0x0a4d|0x0a4e|0x0a4f|0x0a50|0x0a51|0x0a52|0x0a53|0x0a54|0x0a55|0x0a56|0x0a57|0x0a58|0x0a59|0x0a5a|0x0a5b|0x0a5c|0x0a5d|0x0a5e|0x0a5f|0x0a60|0x0a61|0x0a62|0x0a63|0x0a64|0x0a65|0x0a66|0x0a67|0x0a68|0x0a69|0x0a6a|0x0a6b|0x0a6c|0x0a6d|0x0a6e|0x0a6f|0x0a70|0x0a71|0x0a72|0x0a73|0x0a74|0x0a75|0x0a76|0x0a77|0x0a78|0x0a79|0x0a7a|0x0a7b|0x0a7c|0x0a7d|0x0a7e|0x0a7f|0x0a80|0x0a81|0x0a82|0x0a83|0x0a84|0x0a85|0x0a86|0x0a87|0x0a88|0x0a89|0x0a8a|0x0a8b|0x0a8c|0x0a8d|0x0a8e|0x0a8f|0x0a90|0x0a91|0x0a92|0x0a93|0x0a94|0x0a95|0x0a96|0x0a97|0x0a98|0x0a99|0x0a9a|0x0a9b|0x0a9c|0x0a9d|0x0a9e|0x0a9f|0x0bce)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "(0x0179|0x018a|0x317f)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "0x8150";
 	action "kldload -n if_rue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "0x8170";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "(0x8171|0x8172|0x8173|0x8174)";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
-	match "product" "(0x8176|0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e)";
+	match "product" "(0x8176|0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "(0x8187|0x8189)";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "0x818a";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "(0x8197|0x8198)";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "(0x8712|0x8712)";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "0x8754";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "0xc512";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bdb";
 	match "product" "0x1002";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bed";
 	match "product" "(0x1100|0x1101)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bf8";
 	match "product" "0x1001";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bf8";
 	match "product" "0x1009";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c10";
 	match "product" "0x0000";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c26";
 	match "product" "(0x0004|0x0009|0x000a|0x000b|0x000c|0x000d|0x0010|0x0011|0x0012|0x0013|0x0018)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c33";
 	match "product" "0x0010";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c44";
 	match "product" "0x03a2";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c52";
 	match "product" "(0x2101|0x2102|0x2103|0x2104|0x2211|0x2212|0x2213|0x2221|0x2222|0x2223|0x2411|0x2412|0x2413|0x2421|0x2422|0x2423|0x2431|0x2432|0x2433|0x2441|0x2442|0x2443|0x2811|0x2812|0x2813|0x2821|0x2822|0x2823|0x2831|0x2832|0x2833|0x2841|0x2842|0x2843|0x2851|0x2852|0x2853|0x2861|0x2862|0x2863|0x2871|0x2872|0x2873|0x2881|0x2882|0x2883|0x9020)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c6c";
 	match "product" "0x04b2";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c7d";
 	match "product" "0x0005";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c88";
 	match "product" "0x17da";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c88";
 	match "product" "0x17da";
 	action "kldload -n ugensa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c88";
 	match "product" "0x180a";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0c8e";
 	match "product" "0x6000";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cad";
 	match "product" "0x9001";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cde";
 	match "product" "0x0008";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cde";
 	match "product" "0x0011";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cde";
 	match "product" "0x0012";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cde";
 	match "product" "0x0015";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cde";
 	match "product" "0x001a";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cde";
 	match "product" "(0x0022|0x0025)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cf3";
 	match "product" "(0x0001|0x0003|0x0005)";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cf3";
 	match "product" "(0x3002|0x3004|0x311d|0xe004|0xe019)";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0d3a";
 	match "product" "0x0300";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0d46";
 	match "product" "(0x2020|0x2021)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0d8e";
 	match "product" "0x3762";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0d8e";
 	match "product" "(0x7801|0x7811)";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0db0";
 	match "product" "(0x3820|0x3821|0x3822|0x3870|0x3871)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0db0";
 	match "product" "(0x6861|0x6865|0x6869)";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0db0";
 	match "product" "(0x6874|0x6877)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0db0";
 	match "product" "(0x6899|0x821a|0x822a|0x870a|0x871a|0x899a)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0db0";
 	match "product" "(0xa861|0xa874)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0db7";
 	match "product" "0x0002";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0dcd";
 	match "product" "0x0001";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x000d";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x0017";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x0021";
 	action "kldload -n if_mos";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x0028";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "(0x002b|0x002c|0x002d|0x0039|0x003b|0x003c|0x003d|0x003e|0x003f|0x0040|0x0041|0x0042)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x0045";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "(0x0047|0x0048|0x004a)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x004b";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x004d";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "(0x0052|0x005c|0x0061)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x0072";
 	action "kldload -n if_axge";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x061c";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "(0x9071|0x9075)";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "(0x90ac|0x9712)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df7";
 	match "product" "0x0620";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e0b";
 	match "product" "(0x9031|0x9041)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e55";
 	match "product" "0x110b";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e66";
 	match "product" "(0x0001|0x0003|0x0009|0x000b)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e66";
 	match "product" "(0x0015|0x0016)";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e66";
 	match "product" "0x0019";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e66";
 	match "product" "0x400c";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e67";
 	match "product" "0x0002";
 	action "kldload -n uvisor";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e7e";
 	match "product" "0x1001";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e8d";
 	match "product" "0x763f";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0ea0";
 	match "product" "0x6858";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0eab";
 	match "product" "0xc893";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0eb0";
 	match "product" "0x9020";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0eb0";
 	match "product" "0x9021";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0eb0";
 	match "product" "0x9071";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0eba";
 	match "product" "(0x1080|0x2080)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0eef";
 	match "product" "(0x0001|0x0002)";
 	action "kldload -n uep";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0f3d";
 	match "product" "0x0112";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0f3d";
 	match "product" "0x0112";
 	action "kldload -n ugensa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0f3d";
 	match "product" "0x68a3";
 	action "kldload -n usie";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0f3d";
 	match "product" "0x68aa";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0f4e";
 	match "product" "0x0200";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0f88";
 	match "product" "0x3012";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0f88";
 	match "product" "0x3014";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0f94";
 	match "product" "(0x0001|0x0005)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0f98";
 	match "product" "0x0201";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0fb8";
 	match "product" "(0x3001|0x3002|0x3003|0x4001)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0fcf";
 	match "product" "(0x1003|0x1004|0x1006)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0fd8";
 	match "product" "0x0001";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0fde";
 	match "product" "0xca05";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0fe6";
 	match "product" "(0x8101|0x9700)";
 	action "kldload -n if_udav";
 };
 
 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";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1011";
 	match "product" "0x3198";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x103c";
 	match "product" "0x1629";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x103e";
 	match "product" "0x03e8";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1044";
 	match "product" "0x8001";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1044";
 	match "product" "0x8002";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1044";
 	match "product" "0x8007";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1044";
 	match "product" "(0x8008|0x800a)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1044";
 	match "product" "(0x800b|0x800c|0x800d)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1066";
 	match "product" "(0x00ce|0x0300|0x0500|0x0600|0x0700)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x106c";
 	match "product" "0x3701";
 	action "kldload -n umodem";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10a6";
 	match "product" "0xaa26";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10ab";
 	match "product" "0x10c5";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10b5";
 	match "product" "0xac70";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10b5";
 	match "product" "0xac70";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10bd";
 	match "product" "0x1427";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10c4";
 	match "product" "(0x0f91|0x1101|0x1601|0x800a|0x803b|0x8043|0x8044)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10c4";
 	match "product" "0x8053";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10c4";
 	match "product" "(0x8066|0x806f|0x807a|0x80c4|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x815f|0x818b|0x819f|0x81a6|0x81a9|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x83d8|0x8411|0x8418|0x846e|0x8477|0x85ea|0x85eb|0x85f8|0x8664|0x8665|0x88a4|0x88a5|0xea60|0xea61|0xea70|0xea71|0xea80|0xf001|0xf002|0xf003|0xf004)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10c5";
 	match "product" "0xea61";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10ce";
 	match "product" "0xea61";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1114";
 	match "product" "(0x0001|0x0004|0x0006)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x114b";
 	match "product" "0x0110";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x114b";
 	match "product" "0x0150";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1163";
 	match "product" "0x0100";
 	action "kldload -n ucycom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1182";
 	match "product" "0x1388";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1186";
 	match "product" "0x3e04";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1189";
 	match "product" "0x0893";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
 	match "product" "(0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0112|0x0120|0x0218)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
 	match "product" "0x0218";
 	action "kldload -n umodem";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
 	match "product" "(0x0220|0x0224|0x0fff)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
 	match "product" "0x0fff";
 	action "kldload -n usie";
 };
 
 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|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";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
 	match "product" "0x68a3";
 	action "kldload -n usie";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
 	match "product" "0x68aa";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x11ad";
 	match "product" "0x0701";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x11d9";
 	match "product" "(0x1002|0x1003)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x11f5";
 	match "product" "(0x0001|0x0003|0x0004|0x0005)";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x11f6";
 	match "product" "0x2001";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x11f7";
 	match "product" "0x02df";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1209";
 	match "product" "(0x1002|0x1006)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1231";
 	match "product" "(0xce01|0xce02)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x126f";
 	match "product" "0xa006";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x128d";
 	match "product" "0x0001";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x129b";
 	match "product" "0x1666";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x129b";
 	match "product" "0x1828";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
-	match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1464|0x1465|0x14ac|0x14c9|0x14d1|0x14fe|0x1505|0x1506|0x1520|0x1521)";
+	match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1464|0x1465|0x14ac|0x14c9|0x14cf|0x14d1|0x14fe|0x1505|0x1506|0x1520|0x1521|0x1526)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
 	match "product" "0x155b";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
 	match "product" "(0x1803|0x1c05|0x1c0b)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12ef";
 	match "product" "0x0100";
 	action "kldload -n uvisor";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1342";
 	match "product" "0x0202";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1342";
 	match "product" "0x0204";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1371";
 	match "product" "(0x9022|0x9032)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1371";
 	match "product" "0x9401";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1385";
 	match "product" "(0x4250|0x5f00|0x5f02)";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13ad";
 	match "product" "0x9999";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13b1";
 	match "product" "0x000c";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13b1";
 	match "product" "(0x000d|0x0011)";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13b1";
 	match "product" "0x0018";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13b1";
 	match "product" "0x001a";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13b1";
 	match "product" "(0x0020|0x0023)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13b1";
 	match "product" "0x0024";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13b1";
 	match "product" "0x002f";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13d2";
 	match "product" "0x0400";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13d3";
 	match "product" "(0x3247|0x3262|0x3273|0x3284)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13d3";
 	match "product" "0x3304";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13d3";
 	match "product" "0x3305";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13d3";
 	match "product" "(0x3306|0x3309|0x3310|0x3311|0x3325)";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13d3";
 	match "product" "(0x3357|0x3358|0x3359)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13d3";
 	match "product" "(0x3362|0x3375|0x3393)";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1410";
 	match "product" "(0x1100|0x1110|0x1120|0x1130|0x1400|0x1410|0x1420|0x1430|0x1450|0x2100|0x2110|0x2120|0x2130|0x2400|0x2410|0x2420|0x4100|0x4400|0x5010|0x5020|0x5041|0x5100|0x6000|0x6002|0x7001|0x7031|0x7042)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1416";
 	match "product" "0x1110";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1435";
 	match "product" "0x0427";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1435";
 	match "product" "0x0711";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1435";
 	match "product" "(0x0826|0x082a)";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1453";
 	match "product" "0x4026";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1457";
 	match "product" "(0x5118|0x5118)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1472";
 	match "product" "0x0009";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1482";
 	match "product" "0x3c09";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1485";
 	match "product" "(0x0001|0x0002)";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x148f";
 	match "product" "0x1706";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x148f";
 	match "product" "0x2070";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x148f";
 	match "product" "0x2570";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x148f";
 	match "product" "(0x2573|0x2671)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x148f";
 	match "product" "(0x2770|0x2870|0x2878|0x3070|0x3071|0x3072|0x3370|0x3572|0x3573|0x5370|0x5572|0x8070)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x148f";
 	match "product" "0x9020";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x148f";
 	match "product" "0x9021";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x14b2";
 	match "product" "(0x3300|0x3301|0x3302)";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x14b2";
 	match "product" "0x3c02";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x14b2";
 	match "product" "(0x3c06|0x3c07|0x3c08|0x3c09|0x3c11|0x3c12)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x14b2";
 	match "product" "0x3c22";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x14b2";
 	match "product" "(0x3c23|0x3c25|0x3c25|0x3c27|0x3c28)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x14ea";
 	match "product" "0xab10";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x14ea";
 	match "product" "0xab11";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x14ea";
 	match "product" "0xab13";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1555";
 	match "product" "0x0004";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1557";
 	match "product" "0x7720";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1557";
 	match "product" "0x8150";
 	action "kldload -n if_rue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x157e";
 	match "product" "0x3006";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x157e";
 	match "product" "(0x300a|0x300b|0x300d)";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x157e";
 	match "product" "0x300e";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x157e";
 	match "product" "0x3204";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x157e";
 	match "product" "0x3205";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1582";
 	match "product" "0x6003";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x15a9";
 	match "product" "0x0004";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x15a9";
 	match "product" "(0x0006|0x0010)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x15ba";
 	match "product" "(0x0003|0x002b)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x15c5";
 	match "product" "0x0008";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x15e8";
 	match "product" "(0x9100|0x9110)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1614";
 	match "product" "(0x0800|0x0802|0x7002)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1631";
 	match "product" "0x6200";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1631";
 	match "product" "0xc019";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1645";
 	match "product" "(0x0005|0x0008|0x8005)";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x166a";
 	match "product" "(0x0101|0x0201|0x0301|0x0303|0x0304|0x0305|0x0401)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x167b";
 	match "product" "0x4001";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x168c";
 	match "product" "0x0001";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1690";
 	match "product" "0x0601";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1690";
 	match "product" "(0x0710|0x0712)";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1690";
 	match "product" "0x0722";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1690";
 	match "product" "(0x0740|0x0744)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x16ab";
 	match "product" "(0x7801|0x7811)";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x16d5";
 	match "product" "(0x6202|0x6501)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x16d5";
 	match "product" "0x6501";
 	action "kldload -n ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x16d5";
 	match "product" "0x6502";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x16d5";
 	match "product" "0x6502";
 	action "kldload -n ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x16d6";
 	match "product" "0x0001";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x16d8";
 	match "product" "(0x6006|0x6280)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x16d8";
 	match "product" "0x6280";
 	action "kldload -n ugensa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x16dc";
 	match "product" "(0x0010|0x0011|0x0012|0x0015)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1726";
 	match "product" "0x1000";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1726";
 	match "product" "0x1000";
 	action "kldload -n ubsa";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1737";
 	match "product" "0x0039";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1737";
 	match "product" "(0x0070|0x0071)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1737";
 	match "product" "0x0073";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1737";
 	match "product" "(0x0077|0x0078|0x0079)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1740";
 	match "product" "(0x0605|0x0615)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1740";
 	match "product" "0x2000";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1740";
 	match "product" "(0x9603|0x9605)";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1740";
 	match "product" "(0x9701|0x9702|0x9703|0x9705|0x9706|0x9707|0x9708|0x9709|0x9801)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1761";
 	match "product" "0x0b05";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x177f";
 	match "product" "0x0153";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x177f";
 	match "product" "0x0154";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x177f";
 	match "product" "(0x0302|0x0313)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1781";
 	match "product" "0x0c30";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x17a8";
 	match "product" "(0x0001|0x0005)";
 	action "kldload -n uslcom";
 };
 
 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";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1843";
 	match "product" "0x0200";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x18c5";
 	match "product" "0x0002";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x18c5";
 	match "product" "(0x0008|0x0012)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x18e8";
 	match "product" "(0x6196|0x6229)";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x18e8";
 	match "product" "0x6232";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x18e8";
 	match "product" "0x6238";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x18e8";
 	match "product" "0x6259";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x18ef";
 	match "product" "0xe00f";
 	action "kldload -n uslcom";
 };
 
 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|0x2000|0x2002|0x2003|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|0x0117|0x1179|0x1181|0x1514|0x1516|0x2000|0x2002|0x2003|0xffdd|0xffde|0xfff1|0xfff5|0xfffe)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x19f5";
+	match "product" "0x9909";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x1a79";
 	match "product" "0x6001";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1a86";
 	match "product" "(0x5523|0x7523)";
 	action "kldload -n uchcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1a8d";
 	match "product" "(0x1002|0x1003|0x1004|0x1005|0x1006|0x1007|0x1008|0x1009|0x100a|0x100b|0x100c|0x100d|0x100e|0x100f|0x1010|0x1011|0x1012)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1adb";
 	match "product" "0x0001";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1b3d";
 	match "product" "(0x0100|0x0101|0x0102|0x0103|0x0104|0x0105|0x0106|0x0107|0x0108|0x0109|0x010a|0x010b|0x010c|0x010d|0x010e|0x010f|0x0110|0x0111|0x0112|0x0113|0x0114|0x0115|0x0116|0x0117|0x0118|0x0119|0x011a|0x011b|0x011c|0x011d|0x011e|0x011f|0x0120|0x0121|0x0122|0x0123|0x0124|0x0125|0x0126|0x0128|0x0129|0x012a|0x012b|0x012d|0x012e|0x012f|0x0130|0x0131|0x0132|0x0133|0x0134|0x0135|0x0136|0x0137|0x0138|0x0139|0x013a|0x013b|0x013c|0x013d|0x013e|0x013f|0x0140|0x0141|0x0142|0x0143|0x0144|0x0145|0x0146|0x0147|0x0148|0x0149|0x014a|0x014b|0x014c|0x014d|0x014e|0x014f|0x0150|0x0151|0x0152|0x0153|0x0159|0x015a|0x015b|0x015c|0x015d|0x015e|0x015f|0x0160|0x0161|0x0162|0x0163|0x0164|0x0165|0x0166|0x0167|0x0168|0x0169|0x016a|0x016b|0x016c|0x016d|0x016e|0x016f|0x0170|0x0171|0x0172|0x0173|0x0174|0x0175|0x0176|0x0177|0x0178|0x0179|0x017a|0x017b|0x017c|0x017d|0x017e|0x017f|0x0180|0x0181|0x0182|0x0183|0x0184|0x0185|0x0186|0x0187|0x0188|0x0189|0x018a|0x018b|0x018c|0x018d|0x018e|0x018f|0x0190|0x0191|0x0192|0x0193|0x0194|0x0195|0x0196|0x0197|0x0198|0x0199|0x019a|0x019b|0x019c|0x019d|0x019e|0x019f|0x01a0|0x01a1|0x01a2|0x01a3|0x01a4|0x01a5|0x01a6|0x01a7|0x01a8|0x01a9|0x01aa|0x01ab|0x01ac|0x01ad|0x01ae|0x01af|0x01b0|0x01b1|0x01b2|0x01b3|0x01b4|0x01b5|0x01b6|0x01b7|0x01b8|0x01b9|0x01ba|0x01bb|0x01bc|0x01bd|0x01be|0x01bf|0x01c0|0x01c1|0x01c2|0x01c3|0x01c4|0x01c5|0x01c6|0x01c7|0x01c8|0x01c9|0x01ca|0x01cb|0x01cc|0x01cd|0x01ce|0x01cf|0x01d0|0x01d1|0x01d2|0x01d3|0x01d4|0x01d5|0x01d6|0x01d7|0x01d8|0x01d9|0x01da|0x01db|0x01dc|0x01dd|0x01de|0x01df|0x01e0|0x01e1|0x01e2|0x01e3|0x01e4|0x01e5|0x01e6|0x01e7|0x01e8|0x01e9|0x01ea|0x01eb|0x01ec|0x01ed|0x01ee|0x01ef|0x01f0|0x01f1|0x01f2|0x01f3|0x01f4|0x01f5|0x01f6|0x01f7|0x01f8|0x01f9|0x01fa|0x01fb|0x01fc|0x01fd|0x01fe|0x01ff)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1b75";
 	match "product" "0x3072";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1b75";
 	match "product" "0x8187";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1b91";
 	match "product" "0x0064";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1bbb";
 	match "product" "(0x0000|0xf000)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1bc7";
 	match "product" "(0x1003|0x1004)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1bc9";
 	match "product" "0x6001";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1be3";
 	match "product" "0x07a6";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1c0c";
 	match "product" "0x0102";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1c9e";
 	match "product" "(0x6061|0x9603|0x9605|0xf000)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1cf1";
-	match "product" "(0x0001|0x0004|0x0022)";
+	match "product" "(0x0001|0x0004|0x001c|0x0022)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1d09";
 	match "product" "0x4000";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1d34";
 	match "product" "0x0004";
 	action "kldload -n uled";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1d4d";
 	match "product" "(0x0002|0x000c|0x000e|0x0010)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1da5";
 	match "product" "(0x4512|0x4515|0x4519|0x4523)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1e0e";
 	match "product" "(0x9000|0x9200|0xce16)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1e29";
 	match "product" "(0x0102|0x0501)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1eda";
 	match "product" "0x2310";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1fb9";
 	match "product" "(0x0100|0x0200|0x0201|0x0202|0x0203|0x0300|0x0301|0x0302|0x0303|0x0400|0x0401|0x0402|0x0403|0x0404|0x0600|0x0601|0x0602|0x0700|0x0701)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "(0x1a00|0x1a02)";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "0x200c";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
-	match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f)";
+	match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "(0x3a00|0x3a02|0x3a04)";
 	action "kldload -n if_uath";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "0x3c00";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "0x3c05";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "(0x3c09|0x3c0a|0x3c15|0x3c1a|0x3c1b|0x3c1f|0x3c20)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "0x4000";
 	action "kldload -n if_kue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "(0x4001|0x4002|0x4003|0x400b|0x4102)";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "0x4a00";
 	action "kldload -n if_axge";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "(0x7e12|0xa805)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
 	match "product" "0xabc1";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "(0x1201|0x4902)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "0x5303";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "0xab01";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "(0xab24|0xab25)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "0xab28";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "(0xab2a|0xab2b|0xab2e)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "0xab50";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "(0xc007|0xed01)";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "0xed02";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "(0xed06|0xed14)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "0xed17";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x203d";
 	match "product" "(0x1480|0x14a1|0x14a9)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x20b7";
 	match "product" "0x0713";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x20b8";
 	match "product" "0x8888";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x20b9";
 	match "product" "0x1682";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x20f4";
-	match "product" "(0x624d|0x648b)";
+	match "product" "0x624d";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x20f4";
+	match "product" "0x646b";
+	action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x20f4";
+	match "product" "0x648b";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x2100";
 	match "product" "(0x9e52|0x9e54)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x22b8";
 	match "product" "(0x4204|0x4214|0x4224|0x4234|0x4244)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x22b8";
 	match "product" "(0x600c|0x6027)";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x22b8";
 	match "product" "0x710f";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x22de";
 	match "product" "0x6801";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2405";
 	match "product" "0x0003";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2478";
 	match "product" "0x2008";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x3195";
 	match "product" "(0xf190|0xf280|0xf281)";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x3334";
 	match "product" "0x1701";
 	action "kldload -n if_aue";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x3340";
 	match "product" "(0x011c|0x0326|0x0426|0x043a|0x051c|0x053a|0x071c|0x0b1c|0x0e3a|0x0f1c|0x0f3a|0x1326|0x191c|0x2326|0x3326)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x3708";
 	match "product" "(0x20ce|0x21ce)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x4113";
 	match "product" "(0x0210|0x0211|0x0400|0x0410)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x413c";
 	match "product" "(0x4001|0x4002|0x4003|0x4004|0x4005|0x4006|0x4007|0x4008|0x4009)";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x413c";
 	match "product" "(0x8102|0x8104)";
 	action "kldload -n if_upgt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x413c";
 	match "product" "(0x8114|0x8115|0x8116|0x8117|0x8118|0x8128|0x8129|0x8133|0x8134|0x8135|0x8136|0x8137|0x8138|0x8180|0x8181|0x8182)";
 	action "kldload -n u3g";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x413c";
 	match "product" "0x8197";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x413c";
 	match "product" "0x9500";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x4348";
 	match "product" "0x5523";
 	action "kldload -n uchcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x4505";
 	match "product" "0x0010";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x4766";
 	match "product" "0x0001";
 	action "kldload -n uvisor";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x4855";
 	match "product" "(0x0090|0x0091)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x5050";
 	match "product" "(0x0100|0x0101|0x0102|0x0103|0x0104|0x0105|0x0106|0x0107|0x0300|0x0301|0x0400|0x0500|0x0700|0x0800|0x0900|0x0a00|0x0b00|0x0c00|0x0d00|0x0e00|0x0f00|0x1000|0x8000|0x8001|0x8002|0x8003|0x8004|0x8005)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x5173";
 	match "product" "0x1809";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x5372";
 	match "product" "0x2303";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x5a57";
 	match "product" "0x0260";
 	action "kldload -n if_ural";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x5a57";
 	match "product" "(0x0280|0x0282|0x0283|0x0284|0x5257)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x5e04";
 	match "product" "0xce00";
 	action "kldload -n uipaq";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x6189";
 	match "product" "0x182d";
 	action "kldload -n if_axe";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x6189";
 	match "product" "0x2068";
 	action "kldload -n uplcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x6547";
 	match "product" "0x0232";
 	action "kldload -n uark";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x6891";
 	match "product" "0xa727";
 	action "kldload -n if_zyd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x7392";
 	match "product" "0x7318";
 	action "kldload -n if_rum";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x7392";
 	match "product" "(0x7611|0x7612|0x7622)";
 	action "kldload -n if_rsu";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x7392";
 	match "product" "(0x7711|0x7717|0x7718|0x7733)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x7392";
 	match "product" "(0x7811|0x7822)";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x8516";
 	match "product" "(0x2070|0x2770|0x2870|0x3070|0x3071|0x3072|0x3572)";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x9710";
 	match "product" "0x7703";
 	action "kldload -n umoscom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x9710";
 	match "product" "0x7730";
 	action "kldload -n if_mos";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x9710";
 	match "product" "0x7820";
 	action "kldload -n umcs";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x9710";
 	match "product" "(0x7830|0x7832)";
 	action "kldload -n if_mos";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x9710";
 	match "product" "0x7840";
 	action "kldload -n umcs";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x9846";
 	match "product" "0x9041";
 	action "kldload -n if_urtwn";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x9e88";
 	match "product" "0x9e8f";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0xdaae";
 	match "product" "0xead6";
 	action "kldload -n uslcom";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0xdeee";
 	match "product" "(0x0300|0x0302|0x0303)";
 	action "kldload -n uftdi";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0489";
 	match "intclass" "0xff";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x01";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
 	match "intclass" "0xff";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x01";
 	action "kldload -n ng_ubt";
 };
 
 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" "0x0830";
+	match "intclass" "0x02";
+	match "intsubclass" "0x02";
+	match "intprotocol" "0xff";
+	action "kldload -n if_urndis";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0a5c";
 	match "intclass" "0xff";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x01";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
+	match "intclass" "0x02";
+	match "intsubclass" "0x02";
+	match "intprotocol" "0xff";
+	action "kldload -n umodem";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x12d1";
 	match "intclass" "0xff";
 	match "intsubclass" "0x02";
 	match "intprotocol" "0x16";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
 	match "intclass" "0xff";
 	match "intsubclass" "0x02";
 	match "intprotocol" "0x46";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
 	match "intclass" "0xff";
 	match "intsubclass" "0x02";
 	match "intprotocol" "0x76";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x02";
 	match "intsubclass" "0x02";
 	match "intprotocol" "0x00";
 	action "kldload -n umodem";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x02";
 	match "intsubclass" "0x02";
 	match "intprotocol" "0x01";
 	action "kldload -n umodem";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
-	match "intclass" "0x02";
-	match "intsubclass" "0x02";
-	match "intprotocol" "0xff";
-	action "kldload -n umodem";
-};
-
-nomatch 32 {
-	match "bus" "uhub[0-9]+";
-	match "mode" "host";
 	match "intclass" "0x03";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x01";
 	action "kldload -n ukbd";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x03";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x02";
 	action "kldload -n ums";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x07";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x01";
 	action "kldload -n ulpt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x07";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x02";
 	action "kldload -n ulpt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x07";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x03";
 	action "kldload -n ulpt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0xe0";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x01";
 	action "kldload -n ng_ubt";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0xe0";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x03";
 	action "kldload -n if_urndis";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0xef";
 	match "intsubclass" "0x01";
 	match "intprotocol" "0x01";
 	action "kldload -n if_urndis";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0xff";
 	match "intsubclass" "0x5d";
 	match "intprotocol" "0x01";
 	action "kldload -n uhid";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x01";
 	match "intsubclass" "0x01";
 	action "kldload -n snd_uaudio";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x01";
 	match "intsubclass" "0x03";
 	action "kldload -n snd_uaudio";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "(host|device)";
 	match "intclass" "0x02";
 	match "intsubclass" "0x06";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "(host|device)";
 	match "intclass" "0x02";
 	match "intsubclass" "0x0a";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "(host|device)";
 	match "intclass" "0x02";
 	match "intsubclass" "0x0d";
 	action "kldload -n if_cdce";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x02";
 	match "intsubclass" "0x88";
 	action "kldload -n ufoma";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x03";
 	action "kldload -n uhid";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "intclass" "0x08";
 	action "kldload -n umass";
 };
 
-# 2643 USB entries processed
+# 2658 USB entries processed
 
Index: stable/10/sys/dev/usb/net/if_urndis.c
===================================================================
--- stable/10/sys/dev/usb/net/if_urndis.c	(revision 276242)
+++ stable/10/sys/dev/usb/net/if_urndis.c	(revision 276243)
@@ -1,1016 +1,1016 @@
 /*	$OpenBSD: if_urndis.c,v 1.46 2013/12/09 15:45:29 pirofti Exp $ */
 
 /*
  * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
  * Copyright (c) 2010 Fabien Romano <fabien@openbsd.org>
  * Copyright (c) 2010 Michael Knudsen <mk@openbsd.org>
  * Copyright (c) 2014 Hans Petter Selasky <hselasky@freebsd.org>
  * All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/stdint.h>
 #include <sys/stddef.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
 #include <sys/unistd.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include "usbdevs.h"
 
 #define	USB_DEBUG_VAR urndis_debug
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_process.h>
 #include "usb_if.h"
 
 #include <dev/usb/net/usb_ethernet.h>
 #include <dev/usb/net/if_urndisreg.h>
 
 #include <dev/usb/usb_cdc.h>
 
 static device_probe_t urndis_probe;
 static device_attach_t urndis_attach;
 static device_detach_t urndis_detach;
 static device_suspend_t urndis_suspend;
 static device_resume_t urndis_resume;
 
 static usb_callback_t urndis_bulk_write_callback;
 static usb_callback_t urndis_bulk_read_callback;
 static usb_callback_t urndis_intr_read_callback;
 
 static uether_fn_t urndis_attach_post;
 static uether_fn_t urndis_init;
 static uether_fn_t urndis_stop;
 static uether_fn_t urndis_start;
 static uether_fn_t urndis_setmulti;
 static uether_fn_t urndis_setpromisc;
 
 static uint32_t urndis_ctrl_query(struct urndis_softc *, uint32_t, const void **, uint16_t *);
 static uint32_t urndis_ctrl_set(struct urndis_softc *, uint32_t, struct urndis_set_req *, uint16_t);
 static uint32_t urndis_ctrl_handle_init(struct urndis_softc *, const struct urndis_comp_hdr *);
 static uint32_t urndis_ctrl_handle_query(struct urndis_softc *, const struct urndis_comp_hdr *, const void **, uint16_t *);
 static uint32_t urndis_ctrl_handle_reset(struct urndis_softc *, const struct urndis_comp_hdr *);
 static uint32_t urndis_ctrl_init(struct urndis_softc *);
 
 #ifdef USB_DEBUG
 static int urndis_debug = 0;
 static	SYSCTL_NODE(_hw_usb, OID_AUTO, urndis, CTLFLAG_RW, 0, "USB RNDIS-Ethernet");
 SYSCTL_INT(_hw_usb_urndis, OID_AUTO, debug, CTLFLAG_RW, &urndis_debug, 0,
     "Debug level");
 #endif
 
 static const struct usb_config urndis_config[URNDIS_N_TRANSFER] = {
 
 	[URNDIS_BULK_RX] = {
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_RX,
 		.if_index = 0,
 		.frames = 1,
 		.bufsize = RNDIS_RX_MAXLEN,
 		.flags = {.short_xfer_ok = 1,},
 		.callback = urndis_bulk_read_callback,
 		.timeout = 0,		/* no timeout */
 		.usb_mode = USB_MODE_HOST,
 	},
 
 	[URNDIS_BULK_TX] = {
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_TX,
 		.if_index = 0,
 		.frames = RNDIS_TX_FRAMES_MAX,
 		.bufsize = (RNDIS_TX_FRAMES_MAX * RNDIS_TX_MAXLEN),
 		.flags = {
 			.force_short_xfer = 1,
 		},
 		.callback = urndis_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 		.usb_mode = USB_MODE_HOST,
 	},
 
 	[URNDIS_INTR_RX] = {
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_RX,
 		.if_index = 1,
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.flags = {.short_xfer_ok = 1,.no_pipe_ok = 1,},
 		.callback = urndis_intr_read_callback,
 		.timeout = 0,
 		.usb_mode = USB_MODE_HOST,
 	},
 };
 
 static device_method_t urndis_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe, urndis_probe),
 	DEVMETHOD(device_attach, urndis_attach),
 	DEVMETHOD(device_detach, urndis_detach),
 	DEVMETHOD(device_suspend, urndis_suspend),
 	DEVMETHOD(device_resume, urndis_resume),
 
 	DEVMETHOD_END
 };
 
 static driver_t urndis_driver = {
 	.name = "urndis",
 	.methods = urndis_methods,
 	.size = sizeof(struct urndis_softc),
 };
 
 static devclass_t urndis_devclass;
 
 DRIVER_MODULE(urndis, uhub, urndis_driver, urndis_devclass, NULL, 0);
 MODULE_VERSION(urndis, 1);
 MODULE_DEPEND(urndis, uether, 1, 1, 1);
 MODULE_DEPEND(urndis, usb, 1, 1, 1);
 MODULE_DEPEND(urndis, ether, 1, 1, 1);
 
 static const struct usb_ether_methods urndis_ue_methods = {
 	.ue_attach_post = urndis_attach_post,
 	.ue_start = urndis_start,
 	.ue_init = urndis_init,
 	.ue_stop = urndis_stop,
 	.ue_setmulti = urndis_setmulti,
 	.ue_setpromisc = urndis_setpromisc,
 };
 
 static const STRUCT_USB_HOST_ID urndis_host_devs[] = {
-#if 0
-	/* XXX this entry has a conflict an entry the umodem driver XXX */
-	{USB_IFACE_CLASS(UICLASS_CDC), USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
-	USB_IFACE_PROTOCOL(0xff)},
-#endif
+	/* Generic RNDIS class match */
 	{USB_IFACE_CLASS(UICLASS_WIRELESS), USB_IFACE_SUBCLASS(UISUBCLASS_RF),
-	USB_IFACE_PROTOCOL(UIPROTO_RNDIS)},
+		USB_IFACE_PROTOCOL(UIPROTO_RNDIS)},
 	{USB_IFACE_CLASS(UICLASS_IAD), USB_IFACE_SUBCLASS(UISUBCLASS_SYNC),
-	USB_IFACE_PROTOCOL(UIPROTO_ACTIVESYNC)},
+		USB_IFACE_PROTOCOL(UIPROTO_ACTIVESYNC)},
+	/* HP-WebOS */
+	{USB_VENDOR(USB_VENDOR_PALM), USB_IFACE_CLASS(UICLASS_CDC),
+		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
+		USB_IFACE_PROTOCOL(0xff)},
 };
 
 static int
 urndis_probe(device_t dev)
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
 	return (usbd_lookup_id_by_uaa(urndis_host_devs, sizeof(urndis_host_devs), uaa));
 }
 
 static void
 urndis_attach_post(struct usb_ether *ue)
 {
 	/* no-op */
 	return;
 }
 
 static int
 urndis_attach(device_t dev)
 {
 	struct urndis_softc *sc = device_get_softc(dev);
 	struct usb_ether *ue = &sc->sc_ue;
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	struct usb_cdc_cm_descriptor *cmd;
 	struct {
 		struct urndis_set_req hdr;
 		uint32_t filter;
 	} msg_filter;
 	const void *buf;
 	uint16_t bufsz;
 	uint8_t iface_index[2] = { uaa->info.bIfaceIndex + 1, uaa->info.bIfaceIndex };
 	int error;
 	uint8_t i;
 
 	sc->sc_ue.ue_udev = uaa->device;
 	sc->sc_ifaceno_ctl = uaa->info.bIfaceNum;
 
 	cmd = usbd_find_descriptor(uaa->device, NULL, uaa->info.bIfaceIndex,
 	    UDESC_CS_INTERFACE, 0xFF, UDESCSUB_CDC_CM, 0xFF);
 	if (cmd != 0) {
 		DPRINTF("Call Mode Descriptor found, dataif=%d\n", cmd->bDataInterface);
 		iface_index[0] = cmd->bDataInterface;
 	}
 
 	device_set_usb_desc(dev);
 
 	mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
 
 	/* scan the alternate settings looking for a valid one */
 
 	for (i = 0; i != 32; i++) {
 
 		error = usbd_set_alt_interface_index(uaa->device,
 		    iface_index[0], i);
 
 		if (error != 0)
 			break;
 
 		error = usbd_transfer_setup(uaa->device,
 		    iface_index, sc->sc_xfer, urndis_config,
 		    URNDIS_N_TRANSFER, sc, &sc->sc_mtx);
 
 		if (error == 0)
 			break;
 	}
 
 	if ((error != 0) || (i == 32)) {
 		device_printf(dev, "No valid alternate "
 		    "setting found\n");
 		goto detach;
 	}
 	URNDIS_LOCK(sc);
 	error = urndis_ctrl_query(sc, OID_802_3_PERMANENT_ADDRESS, &buf, &bufsz);
 	URNDIS_UNLOCK(sc);
 
 	if (error != (int)RNDIS_STATUS_SUCCESS) {
 		device_printf(dev, "Unable to get hardware address\n");
 		goto detach;
 	}
 	if (bufsz != ETHER_ADDR_LEN) {
 		device_printf(dev, "Invalid address length: %d bytes\n", bufsz);
 		goto detach;
 	}
 	memcpy(&sc->sc_ue.ue_eaddr, buf, ETHER_ADDR_LEN);
 
 	/* Initialize packet filter */
 	sc->sc_filter = RNDIS_PACKET_TYPE_BROADCAST |
 	    RNDIS_PACKET_TYPE_ALL_MULTICAST;
 	msg_filter.filter = htole32(sc->sc_filter);
 
 	URNDIS_LOCK(sc);
 	error = urndis_ctrl_set(sc, OID_GEN_CURRENT_PACKET_FILTER,
 	    &msg_filter.hdr, sizeof(msg_filter));
 	URNDIS_UNLOCK(sc);
 
 	if (error != (int)RNDIS_STATUS_SUCCESS) {
 		device_printf(dev, "Unable to set data filters\n");
 		goto detach;
 	}
 	ue->ue_sc = sc;
 	ue->ue_dev = dev;
 	ue->ue_udev = uaa->device;
 	ue->ue_mtx = &sc->sc_mtx;
 	ue->ue_methods = &urndis_ue_methods;
 
 	error = uether_ifattach(ue);
 	if (error) {
 		device_printf(dev, "Could not attach interface\n");
 		goto detach;
 	}
 
 	URNDIS_LOCK(sc);
 	/* start interrupt endpoint, if any */
 	usbd_transfer_start(sc->sc_xfer[URNDIS_INTR_RX]);
 	URNDIS_UNLOCK(sc);
 
 	return (0);			/* success */
 
 detach:
 	urndis_detach(dev);
 	return (ENXIO);			/* failure */
 }
 
 static int
 urndis_detach(device_t dev)
 {
 	struct urndis_softc *sc = device_get_softc(dev);
 	struct usb_ether *ue = &sc->sc_ue;
 
 	/* stop all USB transfers first */
 	usbd_transfer_unsetup(sc->sc_xfer, URNDIS_N_TRANSFER);
 
 	uether_ifdetach(ue);
 
 	mtx_destroy(&sc->sc_mtx);
 
 	return (0);
 }
 
 static void
 urndis_start(struct usb_ether *ue)
 {
 	struct urndis_softc *sc = uether_getsc(ue);
 
 	/*
 	 * Start the USB transfers, if not already started:
 	 */
 	usbd_transfer_start(sc->sc_xfer[URNDIS_BULK_TX]);
 	usbd_transfer_start(sc->sc_xfer[URNDIS_BULK_RX]);
 }
 
 static void
 urndis_init(struct usb_ether *ue)
 {
 	struct urndis_softc *sc = uether_getsc(ue);
 	struct ifnet *ifp = uether_getifp(ue);
 
 	URNDIS_LOCK_ASSERT(sc, MA_OWNED);
 
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 
 	urndis_ctrl_init(sc);
 
 	/* stall data write direction, which depends on USB mode */
 	usbd_xfer_set_stall(sc->sc_xfer[URNDIS_BULK_TX]);
 
 	/* start data transfers */
 	urndis_start(ue);
 }
 
 static void
 urndis_stop(struct usb_ether *ue)
 {
 	struct urndis_softc *sc = uether_getsc(ue);
 	struct ifnet *ifp = uether_getifp(ue);
 
 	URNDIS_LOCK_ASSERT(sc, MA_OWNED);
 
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 
 	/*
 	 * stop all the transfers, if not already stopped:
 	 */
 	usbd_transfer_stop(sc->sc_xfer[URNDIS_BULK_RX]);
 	usbd_transfer_stop(sc->sc_xfer[URNDIS_BULK_TX]);
 }
 
 static void
 urndis_setmulti(struct usb_ether *ue)
 {
 	/* no-op */
 	return;
 }
 
 static void
 urndis_setpromisc(struct usb_ether *ue)
 {
 	/* no-op */
 	return;
 }
 
 static int
 urndis_suspend(device_t dev)
 {
 	device_printf(dev, "Suspending\n");
 	return (0);
 }
 
 static int
 urndis_resume(device_t dev)
 {
 	device_printf(dev, "Resuming\n");
 	return (0);
 }
 
 static usb_error_t
 urndis_ctrl_msg(struct urndis_softc *sc, uint8_t rt, uint8_t r,
     uint16_t index, uint16_t value, void *buf, uint16_t buflen)
 {
 	usb_device_request_t req;
 
 	req.bmRequestType = rt;
 	req.bRequest = r;
 	USETW(req.wValue, value);
 	USETW(req.wIndex, index);
 	USETW(req.wLength, buflen);
 
 	return (usbd_do_request_flags(sc->sc_ue.ue_udev,
 	    &sc->sc_mtx, &req, buf, (rt & UT_READ) ?
 	    USB_SHORT_XFER_OK : 0, NULL, 2000 /* ms */ ));
 }
 
 static usb_error_t
 urndis_ctrl_send(struct urndis_softc *sc, void *buf, uint16_t len)
 {
 	usb_error_t err;
 
 	err = urndis_ctrl_msg(sc, UT_WRITE_CLASS_INTERFACE, UR_GET_STATUS,
 	    sc->sc_ifaceno_ctl, 0, buf, len);
 
 	DPRINTF("%s\n", usbd_errstr(err));
 
 	return (err);
 }
 
 static struct urndis_comp_hdr *
 urndis_ctrl_recv(struct urndis_softc *sc)
 {
 	struct urndis_comp_hdr *hdr;
 	usb_error_t err;
 
 	err = urndis_ctrl_msg(sc, UT_READ_CLASS_INTERFACE, UR_CLEAR_FEATURE,
 	    sc->sc_ifaceno_ctl, 0, sc->sc_response_buf, RNDIS_RESPONSE_LEN);
 
 	if (err != USB_ERR_NORMAL_COMPLETION)
 		return (NULL);
 
 	hdr = (struct urndis_comp_hdr *)sc->sc_response_buf;
 
 	DPRINTF("type 0x%x len %u\n", le32toh(hdr->rm_type),
 	    le32toh(hdr->rm_len));
 
 	if (le32toh(hdr->rm_len) > RNDIS_RESPONSE_LEN) {
 		DPRINTF("ctrl message error: wrong size %u > %u\n",
 		    le32toh(hdr->rm_len), RNDIS_RESPONSE_LEN);
 		return (NULL);
 	}
 	return (hdr);
 }
 
 static uint32_t
 urndis_ctrl_handle(struct urndis_softc *sc, struct urndis_comp_hdr *hdr,
     const void **buf, uint16_t *bufsz)
 {
 	uint32_t rval;
 
 	DPRINTF("\n");
 
 	if (buf != NULL && bufsz != NULL) {
 		*buf = NULL;
 		*bufsz = 0;
 	}
 	switch (le32toh(hdr->rm_type)) {
 	case REMOTE_NDIS_INITIALIZE_CMPLT:
 		rval = urndis_ctrl_handle_init(sc, hdr);
 		break;
 
 	case REMOTE_NDIS_QUERY_CMPLT:
 		rval = urndis_ctrl_handle_query(sc, hdr, buf, bufsz);
 		break;
 
 	case REMOTE_NDIS_RESET_CMPLT:
 		rval = urndis_ctrl_handle_reset(sc, hdr);
 		break;
 
 	case REMOTE_NDIS_KEEPALIVE_CMPLT:
 	case REMOTE_NDIS_SET_CMPLT:
 		rval = le32toh(hdr->rm_status);
 		break;
 
 	default:
 		DPRINTF("ctrl message error: unknown event 0x%x\n",
 		    le32toh(hdr->rm_type));
 		rval = RNDIS_STATUS_FAILURE;
 		break;
 	}
 	return (rval);
 }
 
 static uint32_t
 urndis_ctrl_handle_init(struct urndis_softc *sc,
     const struct urndis_comp_hdr *hdr)
 {
 	const struct urndis_init_comp *msg;
 
 	msg = (const struct urndis_init_comp *)hdr;
 
 	DPRINTF("len %u rid %u status 0x%x "
 	    "ver_major %u ver_minor %u devflags 0x%x medium 0x%x pktmaxcnt %u "
 	    "pktmaxsz %u align %u aflistoffset %u aflistsz %u\n",
 	    le32toh(msg->rm_len),
 	    le32toh(msg->rm_rid),
 	    le32toh(msg->rm_status),
 	    le32toh(msg->rm_ver_major),
 	    le32toh(msg->rm_ver_minor),
 	    le32toh(msg->rm_devflags),
 	    le32toh(msg->rm_medium),
 	    le32toh(msg->rm_pktmaxcnt),
 	    le32toh(msg->rm_pktmaxsz),
 	    le32toh(msg->rm_align),
 	    le32toh(msg->rm_aflistoffset),
 	    le32toh(msg->rm_aflistsz));
 
 	if (le32toh(msg->rm_status) != RNDIS_STATUS_SUCCESS) {
 		DPRINTF("init failed 0x%x\n", le32toh(msg->rm_status));
 		return (le32toh(msg->rm_status));
 	}
 	if (le32toh(msg->rm_devflags) != RNDIS_DF_CONNECTIONLESS) {
 		DPRINTF("wrong device type (current type: 0x%x)\n",
 		    le32toh(msg->rm_devflags));
 		return (RNDIS_STATUS_FAILURE);
 	}
 	if (le32toh(msg->rm_medium) != RNDIS_MEDIUM_802_3) {
 		DPRINTF("medium not 802.3 (current medium: 0x%x)\n",
 		    le32toh(msg->rm_medium));
 		return (RNDIS_STATUS_FAILURE);
 	}
 	sc->sc_lim_pktsz = le32toh(msg->rm_pktmaxsz);
 
 	return (le32toh(msg->rm_status));
 }
 
 static uint32_t
 urndis_ctrl_handle_query(struct urndis_softc *sc,
     const struct urndis_comp_hdr *hdr, const void **buf, uint16_t *bufsz)
 {
 	const struct urndis_query_comp *msg;
 	uint64_t limit;
 
 	msg = (const struct urndis_query_comp *)hdr;
 
 	DPRINTF("len %u rid %u status 0x%x "
 	    "buflen %u bufoff %u\n",
 	    le32toh(msg->rm_len),
 	    le32toh(msg->rm_rid),
 	    le32toh(msg->rm_status),
 	    le32toh(msg->rm_infobuflen),
 	    le32toh(msg->rm_infobufoffset));
 
 	if (buf != NULL && bufsz != NULL) {
 		*buf = NULL;
 		*bufsz = 0;
 	}
 	if (le32toh(msg->rm_status) != RNDIS_STATUS_SUCCESS) {
 		DPRINTF("query failed 0x%x\n", le32toh(msg->rm_status));
 		return (le32toh(msg->rm_status));
 	}
 	limit = le32toh(msg->rm_infobuflen);
 	limit += le32toh(msg->rm_infobufoffset);
 	limit += RNDIS_HEADER_OFFSET;
 
 	if (limit > (uint64_t)le32toh(msg->rm_len)) {
 		DPRINTF("ctrl message error: invalid query info "
 		    "len/offset/end_position(%u/%u/%u) -> "
 		    "go out of buffer limit %u\n",
 		    le32toh(msg->rm_infobuflen),
 		    le32toh(msg->rm_infobufoffset),
 		    le32toh(msg->rm_infobuflen) +
 		    le32toh(msg->rm_infobufoffset) + RNDIS_HEADER_OFFSET,
 		    le32toh(msg->rm_len));
 		return (RNDIS_STATUS_FAILURE);
 	}
 	if (buf != NULL && bufsz != NULL) {
 		*buf = ((const uint8_t *)msg) + RNDIS_HEADER_OFFSET + le32toh(msg->rm_infobufoffset);
 		*bufsz = le32toh(msg->rm_infobuflen);
 	}
 	return (le32toh(msg->rm_status));
 }
 
 static uint32_t
 urndis_ctrl_handle_reset(struct urndis_softc *sc,
     const struct urndis_comp_hdr *hdr)
 {
 	const struct urndis_reset_comp *msg;
 	uint32_t rval;
 
 	msg = (const struct urndis_reset_comp *)hdr;
 
 	rval = le32toh(msg->rm_status);
 
 	DPRINTF("len %u status 0x%x "
 	    "adrreset %u\n",
 	    le32toh(msg->rm_len),
 	    rval,
 	    le32toh(msg->rm_adrreset));
 
 	if (rval != RNDIS_STATUS_SUCCESS) {
 		DPRINTF("reset failed 0x%x\n", rval);
 		return (rval);
 	}
 	if (msg->rm_adrreset != 0) {
 		struct {
 			struct urndis_set_req hdr;
 			uint32_t filter;
 		} msg_filter;
 
 		msg_filter.filter = htole32(sc->sc_filter);
 
 		rval = urndis_ctrl_set(sc, OID_GEN_CURRENT_PACKET_FILTER,
 		    &msg_filter.hdr, sizeof(msg_filter));
 
 		if (rval != RNDIS_STATUS_SUCCESS) {
 			DPRINTF("unable to reset data filters\n");
 			return (rval);
 		}
 	}
 	return (rval);
 }
 
 static uint32_t
 urndis_ctrl_init(struct urndis_softc *sc)
 {
 	struct urndis_init_req msg;
 	struct urndis_comp_hdr *hdr;
 	uint32_t rval;
 
 	msg.rm_type = htole32(REMOTE_NDIS_INITIALIZE_MSG);
 	msg.rm_len = htole32(sizeof(msg));
 	msg.rm_rid = htole32(0);
 	msg.rm_ver_major = htole32(1);
 	msg.rm_ver_minor = htole32(1);
 	msg.rm_max_xfersz = htole32(RNDIS_RX_MAXLEN);
 
 	DPRINTF("type %u len %u rid %u ver_major %u "
 	    "ver_minor %u max_xfersz %u\n",
 	    le32toh(msg.rm_type),
 	    le32toh(msg.rm_len),
 	    le32toh(msg.rm_rid),
 	    le32toh(msg.rm_ver_major),
 	    le32toh(msg.rm_ver_minor),
 	    le32toh(msg.rm_max_xfersz));
 
 	rval = urndis_ctrl_send(sc, &msg, sizeof(msg));
 
 	if (rval != RNDIS_STATUS_SUCCESS) {
 		DPRINTF("init failed\n");
 		return (rval);
 	}
 	if ((hdr = urndis_ctrl_recv(sc)) == NULL) {
 		DPRINTF("unable to get init response\n");
 		return (RNDIS_STATUS_FAILURE);
 	}
 	rval = urndis_ctrl_handle(sc, hdr, NULL, NULL);
 
 	return (rval);
 }
 
 #if 0
 static uint32_t
 urndis_ctrl_halt(struct urndis_softc *sc)
 {
 	struct urndis_halt_req msg;
 	uint32_t rval;
 
 	msg.rm_type = htole32(REMOTE_NDIS_HALT_MSG);
 	msg.rm_len = htole32(sizeof(msg));
 	msg.rm_rid = 0;
 
 	DPRINTF("type %u len %u rid %u\n",
 	    le32toh(msg.rm_type),
 	    le32toh(msg.rm_len),
 	    le32toh(msg.rm_rid));
 
 	rval = urndis_ctrl_send(sc, &msg, sizeof(msg));
 
 	if (rval != RNDIS_STATUS_SUCCESS)
 		printf("halt failed\n");
 
 	return (rval);
 }
 
 #endif
 
 static uint32_t
 urndis_ctrl_query(struct urndis_softc *sc, uint32_t oid, const void **rbuf, uint16_t *rbufsz)
 {
 	struct urndis_query_req msg;
 	uint32_t rval;
 	struct urndis_comp_hdr *hdr;
 
 	msg.rm_type = htole32(REMOTE_NDIS_QUERY_MSG);
 	msg.rm_len = htole32(sizeof(msg));
 	msg.rm_rid = 0;			/* XXX */
 	msg.rm_oid = htole32(oid);
 	msg.rm_infobuflen = htole32(0);
 	msg.rm_infobufoffset = 0;
 	msg.rm_devicevchdl = 0;
 
 	DPRINTF("type %u len %u rid %u oid 0x%x "
 	    "infobuflen %u infobufoffset %u devicevchdl %u\n",
 	    le32toh(msg.rm_type),
 	    le32toh(msg.rm_len),
 	    le32toh(msg.rm_rid),
 	    le32toh(msg.rm_oid),
 	    le32toh(msg.rm_infobuflen),
 	    le32toh(msg.rm_infobufoffset),
 	    le32toh(msg.rm_devicevchdl));
 
 	rval = urndis_ctrl_send(sc, &msg, sizeof(msg));
 
 	if (rval != RNDIS_STATUS_SUCCESS) {
 		DPRINTF("query failed\n");
 		return (rval);
 	}
 	if ((hdr = urndis_ctrl_recv(sc)) == NULL) {
 		DPRINTF("unable to get query response\n");
 		return (RNDIS_STATUS_FAILURE);
 	}
 	rval = urndis_ctrl_handle(sc, hdr, rbuf, rbufsz);
 
 	return (rval);
 }
 
 static uint32_t
 urndis_ctrl_set(struct urndis_softc *sc, uint32_t oid, struct urndis_set_req *msg, uint16_t len)
 {
 	struct urndis_comp_hdr *hdr;
 	uint32_t rval;
 	uint32_t datalen = len - sizeof(*msg);
 
 	msg->rm_type = htole32(REMOTE_NDIS_SET_MSG);
 	msg->rm_len = htole32(len);
 	msg->rm_rid = 0;		/* XXX */
 	msg->rm_oid = htole32(oid);
 	msg->rm_infobuflen = htole32(datalen);
 	if (datalen != 0) {
 		msg->rm_infobufoffset = htole32(sizeof(*msg) - RNDIS_HEADER_OFFSET);
 	} else {
 		msg->rm_infobufoffset = 0;
 	}
 	msg->rm_devicevchdl = 0;
 
 	DPRINTF("type %u len %u rid %u oid 0x%x "
 	    "infobuflen %u infobufoffset %u devicevchdl %u\n",
 	    le32toh(msg->rm_type),
 	    le32toh(msg->rm_len),
 	    le32toh(msg->rm_rid),
 	    le32toh(msg->rm_oid),
 	    le32toh(msg->rm_infobuflen),
 	    le32toh(msg->rm_infobufoffset),
 	    le32toh(msg->rm_devicevchdl));
 
 	rval = urndis_ctrl_send(sc, msg, len);
 
 	if (rval != RNDIS_STATUS_SUCCESS) {
 		DPRINTF("set failed\n");
 		return (rval);
 	}
 	if ((hdr = urndis_ctrl_recv(sc)) == NULL) {
 		DPRINTF("unable to get set response\n");
 		return (RNDIS_STATUS_FAILURE);
 	}
 	rval = urndis_ctrl_handle(sc, hdr, NULL, NULL);
 	if (rval != RNDIS_STATUS_SUCCESS)
 		DPRINTF("set failed 0x%x\n", rval);
 
 	return (rval);
 }
 
 static void
 urndis_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct urndis_softc *sc = usbd_xfer_softc(xfer);
 	struct usb_page_cache *pc = usbd_xfer_get_frame(xfer, 0);
 	struct ifnet *ifp = uether_getifp(&sc->sc_ue);
 	struct urndis_packet_msg msg;
 	struct mbuf *m;
 	int actlen;
 	int aframes;
 	int offset;
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 
 		usbd_xfer_status(xfer, &actlen, NULL, &aframes, NULL);
 
 		DPRINTFN(1, "received %u bytes in %u frames\n", actlen, aframes);
 
 		for (offset = 0; actlen >= (uint32_t)sizeof(msg);) {
 
 			/* copy out header */
 			usbd_copy_out(pc, offset, &msg, sizeof(msg));
 
 			if (le32toh(0x1234567U) != 0x1234567U) {
 				/* swap endianness */
 				msg.rm_type = le32toh(msg.rm_type);
 				msg.rm_len = le32toh(msg.rm_len);
 				msg.rm_dataoffset = le32toh(msg.rm_dataoffset);
 				msg.rm_datalen = le32toh(msg.rm_datalen);
 				msg.rm_oobdataoffset = le32toh(msg.rm_oobdataoffset);
 				msg.rm_oobdatalen = le32toh(msg.rm_oobdatalen);
 				msg.rm_oobdataelements = le32toh(msg.rm_oobdataelements);
 				msg.rm_pktinfooffset = le32toh(msg.rm_pktinfooffset);
 				msg.rm_pktinfolen = le32toh(msg.rm_pktinfolen);
 				msg.rm_vchandle = le32toh(msg.rm_vchandle);
 				msg.rm_reserved = le32toh(msg.rm_reserved);
 			}
 
 			DPRINTF("len %u data(off:%u len:%u) "
 			    "oobdata(off:%u len:%u nb:%u) perpacket(off:%u len:%u)\n",
 			    msg.rm_len, msg.rm_dataoffset, msg.rm_datalen,
 			    msg.rm_oobdataoffset, msg.rm_oobdatalen,
 			    msg.rm_oobdataelements, msg.rm_pktinfooffset,
 			    msg.rm_pktinfooffset);
 
 			/* sanity check the RNDIS header */
 			if (msg.rm_type != REMOTE_NDIS_PACKET_MSG) {
 				DPRINTF("invalid type 0x%x != 0x%x\n",
 				    msg.rm_type, REMOTE_NDIS_PACKET_MSG);
 				goto tr_setup;
 			} else if (msg.rm_len < (uint32_t)sizeof(msg)) {
 				DPRINTF("invalid msg len %u < %u\n",
 				    msg.rm_len, (unsigned)sizeof(msg));
 				goto tr_setup;
 			} else if (msg.rm_len > (uint32_t)actlen) {
 				DPRINTF("invalid msg len %u > buffer "
 				    "len %u\n", msg.rm_len, actlen);
 				goto tr_setup;
 			} else if (msg.rm_dataoffset >= (uint32_t)actlen) {
 				DPRINTF("invalid msg dataoffset %u > buffer "
 				    "dataoffset %u\n", msg.rm_dataoffset, actlen);
 				goto tr_setup;
 			} else if (msg.rm_datalen > (uint32_t)actlen) {
 				DPRINTF("invalid msg datalen %u > buffer "
 				    "datalen %u\n", msg.rm_datalen, actlen);
 				goto tr_setup;
 			} else if ((msg.rm_dataoffset + msg.rm_datalen +
 			    (uint32_t)__offsetof(struct urndis_packet_msg,
 			    rm_dataoffset)) > (uint32_t)actlen) {
 				DPRINTF("invalid dataoffset %u larger than %u\n",
 				    msg.rm_dataoffset + msg.rm_datalen +
 				    (uint32_t)__offsetof(struct urndis_packet_msg,
 				    rm_dataoffset), actlen);
 				goto tr_setup;
 			} else if (msg.rm_datalen < (uint32_t)sizeof(struct ether_header)) {
 				ifp->if_ierrors++;
 				DPRINTF("invalid ethernet size "
 				    "%u < %u\n", msg.rm_datalen, (unsigned)sizeof(struct ether_header));
 				goto tr_setup;
 			} else if (msg.rm_datalen > (uint32_t)MCLBYTES) {
 				ifp->if_ierrors++;
 				DPRINTF("invalid ethernet size "
 				    "%u > %u\n",
 				    msg.rm_datalen, (unsigned)MCLBYTES);
 				goto tr_setup;
 			} else if (msg.rm_datalen > (uint32_t)(MHLEN - ETHER_ALIGN)) {
 				m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 			} else {
 				m = m_gethdr(M_NOWAIT, MT_DATA);
 			}
 
 			/* check if we have a buffer */
 			if (m != NULL) {
 				m_adj(m, ETHER_ALIGN);
 
 				usbd_copy_out(pc, offset + msg.rm_dataoffset +
 				    __offsetof(struct urndis_packet_msg,
 				    rm_dataoffset), m->m_data, msg.rm_datalen);
 
 				/* enqueue */
 				uether_rxmbuf(&sc->sc_ue, m, msg.rm_datalen);
 			} else {
 				ifp->if_ierrors++;
 			}
 			offset += msg.rm_len;
 			actlen -= msg.rm_len;
 		}
 
 	case USB_ST_SETUP:
 tr_setup:
 		usbd_xfer_set_frame_len(xfer, 0, RNDIS_RX_MAXLEN);
 		usbd_xfer_set_frames(xfer, 1);
 		usbd_transfer_submit(xfer);
 		uether_rxflush(&sc->sc_ue);	/* must be last */
 		break;
 
 	default:			/* Error */
 		DPRINTFN(1, "error = %s\n", usbd_errstr(error));
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
 			usbd_xfer_set_stall(xfer);
 			usbd_xfer_set_frames(xfer, 0);
 			usbd_transfer_submit(xfer);
 		}
 		break;
 	}
 }
 
 static void
 urndis_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct urndis_packet_msg msg;
 	struct urndis_softc *sc = usbd_xfer_softc(xfer);
 	struct ifnet *ifp = uether_getifp(&sc->sc_ue);
 	struct mbuf *m;
 	unsigned x;
 	int actlen;
 	int aframes;
 
 	usbd_xfer_status(xfer, &actlen, NULL, &aframes, NULL);
 
 	DPRINTFN(1, "\n");
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		DPRINTFN(11, "%u bytes in %u frames\n", actlen, aframes);
 
 		ifp->if_opackets++;
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
 tr_setup:
 		memset(&msg, 0, sizeof(msg));
 
 		for (x = 0; x != RNDIS_TX_FRAMES_MAX; x++) {
 			struct usb_page_cache *pc = usbd_xfer_get_frame(xfer, x);
 
 			usbd_xfer_set_frame_offset(xfer, x * RNDIS_TX_MAXLEN, x);
 
 	next_pkt:
 			IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
 
 			if (m == NULL)
 				break;
 
 			if ((m->m_pkthdr.len + sizeof(msg)) > RNDIS_TX_MAXLEN) {
 				DPRINTF("Too big packet\n");
 				ifp->if_oerrors++;
 
 				/* Free buffer */
 				m_freem(m);
 				goto next_pkt;
 			}
 			msg.rm_type = htole32(REMOTE_NDIS_PACKET_MSG);
 			msg.rm_len = htole32(sizeof(msg) + m->m_pkthdr.len);
 
 			msg.rm_dataoffset = htole32(RNDIS_DATA_OFFSET);
 			msg.rm_datalen = htole32(m->m_pkthdr.len);
 
 			/* copy in all data */
 			usbd_copy_in(pc, 0, &msg, sizeof(msg));
 			usbd_m_copy_in(pc, sizeof(msg), m, 0, m->m_pkthdr.len);
 			usbd_xfer_set_frame_len(xfer, x, sizeof(msg) + m->m_pkthdr.len);
 
 			/*
 			 * If there's a BPF listener, bounce a copy of
 			 * this frame to him:
 			 */
 			BPF_MTAP(ifp, m);
 
 			/* Free buffer */
 			m_freem(m);
 		}
 		if (x != 0) {
 			usbd_xfer_set_frames(xfer, x);
 			usbd_transfer_submit(xfer);
 		}
 		break;
 
 	default:			/* Error */
 		DPRINTFN(11, "transfer error, %s\n", usbd_errstr(error));
 
 		/* count output errors */
 		ifp->if_oerrors++;
 
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
 			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
 		break;
 	}
 }
 
 static void
 urndis_intr_read_callback(struct usb_xfer *xfer, usb_error_t error)
 {
 	int actlen;
 
 	usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 
 		DPRINTF("Received %d bytes\n", actlen);
 
 		/* TODO: decode some indications */
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
 tr_setup:
 		usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
 		usbd_transfer_submit(xfer);
 		break;
 
 	default:			/* Error */
 		if (error != USB_ERR_CANCELLED) {
 			/* start clear stall */
 			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
 		break;
 	}
 }
Index: stable/10/sys/dev/usb/serial/umodem.c
===================================================================
--- stable/10/sys/dev/usb/serial/umodem.c	(revision 276242)
+++ stable/10/sys/dev/usb/serial/umodem.c	(revision 276243)
@@ -1,905 +1,905 @@
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 /*-
  * Copyright (c) 2003, M. Warner Losh <imp@FreeBSD.org>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
 /*
  * Comm Class spec:  http://www.usb.org/developers/devclass_docs/usbccs10.pdf
  *                   http://www.usb.org/developers/devclass_docs/usbcdc11.pdf
  *                   http://www.usb.org/developers/devclass_docs/cdc_wmc10.zip
  */
 
 /*
  * TODO:
  * - Add error recovery in various places; the big problem is what
  *   to do in a callback if there is an error.
  * - Implement a Call Device for modems without multiplexed commands.
  *
  */
 
 #include <sys/stdint.h>
 #include <sys/stddef.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
 #include <sys/unistd.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbhid.h>
 #include <dev/usb/usb_cdc.h>
 #include "usbdevs.h"
 
 #include <dev/usb/usb_ioctl.h>
 
 #define	USB_DEBUG_VAR umodem_debug
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_process.h>
 #include <dev/usb/quirk/usb_quirk.h>
 
 #include <dev/usb/serial/usb_serial.h>
 
 #ifdef USB_DEBUG
 static int umodem_debug = 0;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem");
 SYSCTL_INT(_hw_usb_umodem, OID_AUTO, debug, CTLFLAG_RW,
     &umodem_debug, 0, "Debug level");
 #endif
 
 static const STRUCT_USB_HOST_ID umodem_devs[] = {
 	/* Generic Modem class match */
 	{USB_IFACE_CLASS(UICLASS_CDC),
 		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
 		USB_IFACE_PROTOCOL(UIPROTO_CDC_AT)},
 	/* Huawei Modem class match */
-	{USB_IFACE_CLASS(UICLASS_CDC),
+	{USB_VENDOR(USB_VENDOR_HUAWEI),USB_IFACE_CLASS(UICLASS_CDC),
 		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
 		USB_IFACE_PROTOCOL(0xFF)},
 	/* Kyocera AH-K3001V */
 	{USB_VPI(USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V, 1)},
 	{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, 1)},
 	{USB_VPI(USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_PC5740, 1)},
 };
 
 /*
  * As speeds for umodem devices increase, these numbers will need to
  * be increased. They should be good for G3 speeds and below.
  *
  * TODO: The TTY buffers should be increased!
  */
 #define	UMODEM_BUF_SIZE 1024
 
 enum {
 	UMODEM_BULK_WR,
 	UMODEM_BULK_RD,
 	UMODEM_INTR_RD,
 	UMODEM_N_TRANSFER,
 };
 
 #define	UMODEM_MODVER			1	/* module version */
 
 struct umodem_softc {
 	struct ucom_super_softc sc_super_ucom;
 	struct ucom_softc sc_ucom;
 
 	struct usb_xfer *sc_xfer[UMODEM_N_TRANSFER];
 	struct usb_device *sc_udev;
 	struct mtx sc_mtx;
 
 	uint16_t sc_line;
 
 	uint8_t	sc_lsr;			/* local status register */
 	uint8_t	sc_msr;			/* modem status register */
 	uint8_t	sc_ctrl_iface_no;
 	uint8_t	sc_data_iface_no;
 	uint8_t sc_iface_index[2];
 	uint8_t	sc_cm_over_data;
 	uint8_t	sc_cm_cap;		/* CM capabilities */
 	uint8_t	sc_acm_cap;		/* ACM capabilities */
 };
 
 static device_probe_t umodem_probe;
 static device_attach_t umodem_attach;
 static device_detach_t umodem_detach;
 static void umodem_free_softc(struct umodem_softc *);
 
 static usb_callback_t umodem_intr_callback;
 static usb_callback_t umodem_write_callback;
 static usb_callback_t umodem_read_callback;
 
 static void	umodem_free(struct ucom_softc *);
 static void	umodem_start_read(struct ucom_softc *);
 static void	umodem_stop_read(struct ucom_softc *);
 static void	umodem_start_write(struct ucom_softc *);
 static void	umodem_stop_write(struct ucom_softc *);
 static void	umodem_get_caps(struct usb_attach_arg *, uint8_t *, uint8_t *);
 static void	umodem_cfg_get_status(struct ucom_softc *, uint8_t *,
 		    uint8_t *);
 static int	umodem_pre_param(struct ucom_softc *, struct termios *);
 static void	umodem_cfg_param(struct ucom_softc *, struct termios *);
 static int	umodem_ioctl(struct ucom_softc *, uint32_t, caddr_t, int,
 		    struct thread *);
 static void	umodem_cfg_set_dtr(struct ucom_softc *, uint8_t);
 static void	umodem_cfg_set_rts(struct ucom_softc *, uint8_t);
 static void	umodem_cfg_set_break(struct ucom_softc *, uint8_t);
 static void	*umodem_get_desc(struct usb_attach_arg *, uint8_t, uint8_t);
 static usb_error_t umodem_set_comm_feature(struct usb_device *, uint8_t,
 		    uint16_t, uint16_t);
 static void	umodem_poll(struct ucom_softc *ucom);
 static void	umodem_find_data_iface(struct usb_attach_arg *uaa,
 		    uint8_t, uint8_t *, uint8_t *);
 
 static const struct usb_config umodem_config[UMODEM_N_TRANSFER] = {
 
 	[UMODEM_BULK_WR] = {
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.if_index = 0,
 		.bufsize = UMODEM_BUF_SIZE,
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
 		.callback = &umodem_write_callback,
 	},
 
 	[UMODEM_BULK_RD] = {
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.if_index = 0,
 		.bufsize = UMODEM_BUF_SIZE,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
 		.callback = &umodem_read_callback,
 	},
 
 	[UMODEM_INTR_RD] = {
 		.type = UE_INTERRUPT,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.if_index = 1,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.no_pipe_ok = 1,},
 		.bufsize = 0,	/* use wMaxPacketSize */
 		.callback = &umodem_intr_callback,
 	},
 };
 
 static const struct ucom_callback umodem_callback = {
 	.ucom_cfg_get_status = &umodem_cfg_get_status,
 	.ucom_cfg_set_dtr = &umodem_cfg_set_dtr,
 	.ucom_cfg_set_rts = &umodem_cfg_set_rts,
 	.ucom_cfg_set_break = &umodem_cfg_set_break,
 	.ucom_cfg_param = &umodem_cfg_param,
 	.ucom_pre_param = &umodem_pre_param,
 	.ucom_ioctl = &umodem_ioctl,
 	.ucom_start_read = &umodem_start_read,
 	.ucom_stop_read = &umodem_stop_read,
 	.ucom_start_write = &umodem_start_write,
 	.ucom_stop_write = &umodem_stop_write,
 	.ucom_poll = &umodem_poll,
 	.ucom_free = &umodem_free,
 };
 
 static device_method_t umodem_methods[] = {
 	DEVMETHOD(device_probe, umodem_probe),
 	DEVMETHOD(device_attach, umodem_attach),
 	DEVMETHOD(device_detach, umodem_detach),
 	DEVMETHOD_END
 };
 
 static devclass_t umodem_devclass;
 
 static driver_t umodem_driver = {
 	.name = "umodem",
 	.methods = umodem_methods,
 	.size = sizeof(struct umodem_softc),
 };
 
 DRIVER_MODULE(umodem, uhub, umodem_driver, umodem_devclass, NULL, 0);
 MODULE_DEPEND(umodem, ucom, 1, 1, 1);
 MODULE_DEPEND(umodem, usb, 1, 1, 1);
 MODULE_VERSION(umodem, UMODEM_MODVER);
 
 static int
 umodem_probe(device_t dev)
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	int error;
 
 	DPRINTFN(11, "\n");
 
 	if (uaa->usb_mode != USB_MODE_HOST)
 		return (ENXIO);
 
 	error = usbd_lookup_id_by_uaa(umodem_devs, sizeof(umodem_devs), uaa);
 	if (error)
 		return (error);
 
 	return (BUS_PROBE_GENERIC);
 }
 
 static int
 umodem_attach(device_t dev)
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	struct umodem_softc *sc = device_get_softc(dev);
 	struct usb_cdc_cm_descriptor *cmd;
 	struct usb_cdc_union_descriptor *cud;
 	uint8_t i;
 	int error;
 
 	device_set_usb_desc(dev);
 	mtx_init(&sc->sc_mtx, "umodem", NULL, MTX_DEF);
 	ucom_ref(&sc->sc_super_ucom);
 
 	sc->sc_ctrl_iface_no = uaa->info.bIfaceNum;
 	sc->sc_iface_index[1] = uaa->info.bIfaceIndex;
 	sc->sc_udev = uaa->device;
 
 	umodem_get_caps(uaa, &sc->sc_cm_cap, &sc->sc_acm_cap);
 
 	/* get the data interface number */
 
 	cmd = umodem_get_desc(uaa, UDESC_CS_INTERFACE, UDESCSUB_CDC_CM);
 
 	if ((cmd == NULL) || (cmd->bLength < sizeof(*cmd))) {
 
 		cud = usbd_find_descriptor(uaa->device, NULL,
 		    uaa->info.bIfaceIndex, UDESC_CS_INTERFACE,
 		    0xFF, UDESCSUB_CDC_UNION, 0xFF);
 
 		if ((cud == NULL) || (cud->bLength < sizeof(*cud))) {
 			DPRINTF("Missing descriptor. "
 			    "Assuming data interface is next.\n");
 			if (sc->sc_ctrl_iface_no == 0xFF) {
 				goto detach;
 			} else {
 				uint8_t class_match = 0;
 
 				/* set default interface number */
 				sc->sc_data_iface_no = 0xFF;
 
 				/* try to find the data interface backwards */
 				umodem_find_data_iface(uaa,
 				    uaa->info.bIfaceIndex - 1,
 				    &sc->sc_data_iface_no, &class_match);
 
 				/* try to find the data interface forwards */
 				umodem_find_data_iface(uaa,
 				    uaa->info.bIfaceIndex + 1,
 				    &sc->sc_data_iface_no, &class_match);
 
 				/* check if nothing was found */
 				if (sc->sc_data_iface_no == 0xFF)
 					goto detach;
 			}
 		} else {
 			sc->sc_data_iface_no = cud->bSlaveInterface[0];
 		}
 	} else {
 		sc->sc_data_iface_no = cmd->bDataInterface;
 	}
 
 	device_printf(dev, "data interface %d, has %sCM over "
 	    "data, has %sbreak\n",
 	    sc->sc_data_iface_no,
 	    sc->sc_cm_cap & USB_CDC_CM_OVER_DATA ? "" : "no ",
 	    sc->sc_acm_cap & USB_CDC_ACM_HAS_BREAK ? "" : "no ");
 
 	/* get the data interface too */
 
 	for (i = 0;; i++) {
 		struct usb_interface *iface;
 		struct usb_interface_descriptor *id;
 
 		iface = usbd_get_iface(uaa->device, i);
 
 		if (iface) {
 
 			id = usbd_get_interface_descriptor(iface);
 
 			if (id && (id->bInterfaceNumber == sc->sc_data_iface_no)) {
 				sc->sc_iface_index[0] = i;
 				usbd_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex);
 				break;
 			}
 		} else {
 			device_printf(dev, "no data interface\n");
 			goto detach;
 		}
 	}
 
 	if (usb_test_quirk(uaa, UQ_ASSUME_CM_OVER_DATA)) {
 		sc->sc_cm_over_data = 1;
 	} else {
 		if (sc->sc_cm_cap & USB_CDC_CM_OVER_DATA) {
 			if (sc->sc_acm_cap & USB_CDC_ACM_HAS_FEATURE) {
 
 				error = umodem_set_comm_feature
 				(uaa->device, sc->sc_ctrl_iface_no,
 				 UCDC_ABSTRACT_STATE, UCDC_DATA_MULTIPLEXED);
 
 				/* ignore any errors */
 			}
 			sc->sc_cm_over_data = 1;
 		}
 	}
 	error = usbd_transfer_setup(uaa->device,
 	    sc->sc_iface_index, sc->sc_xfer,
 	    umodem_config, UMODEM_N_TRANSFER,
 	    sc, &sc->sc_mtx);
 	if (error) {
 		goto detach;
 	}
 
 	/* clear stall at first run */
 	mtx_lock(&sc->sc_mtx);
 	usbd_xfer_set_stall(sc->sc_xfer[UMODEM_BULK_WR]);
 	usbd_xfer_set_stall(sc->sc_xfer[UMODEM_BULK_RD]);
 	mtx_unlock(&sc->sc_mtx);
 
 	error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc,
 	    &umodem_callback, &sc->sc_mtx);
 	if (error) {
 		goto detach;
 	}
 	ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
 
 	return (0);
 
 detach:
 	umodem_detach(dev);
 	return (ENXIO);
 }
 
 static void
 umodem_find_data_iface(struct usb_attach_arg *uaa,
     uint8_t iface_index, uint8_t *p_data_no, uint8_t *p_match_class)
 {
 	struct usb_interface_descriptor *id;
 	struct usb_interface *iface;
 	
 	iface = usbd_get_iface(uaa->device, iface_index);
 
 	/* check for end of interfaces */
 	if (iface == NULL)
 		return;
 
 	id = usbd_get_interface_descriptor(iface);
 
 	/* check for non-matching interface class */
 	if (id->bInterfaceClass != UICLASS_CDC_DATA ||
 	    id->bInterfaceSubClass != UISUBCLASS_DATA) {
 		/* if we got a class match then return */
 		if (*p_match_class)
 			return;
 	} else {
 		*p_match_class = 1;
 	}
 
 	DPRINTFN(11, "Match at index %u\n", iface_index);
 
 	*p_data_no = id->bInterfaceNumber;
 }
 
 static void
 umodem_start_read(struct ucom_softc *ucom)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 
 	/* start interrupt endpoint, if any */
 	usbd_transfer_start(sc->sc_xfer[UMODEM_INTR_RD]);
 
 	/* start read endpoint */
 	usbd_transfer_start(sc->sc_xfer[UMODEM_BULK_RD]);
 }
 
 static void
 umodem_stop_read(struct ucom_softc *ucom)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 
 	/* stop interrupt endpoint, if any */
 	usbd_transfer_stop(sc->sc_xfer[UMODEM_INTR_RD]);
 
 	/* stop read endpoint */
 	usbd_transfer_stop(sc->sc_xfer[UMODEM_BULK_RD]);
 }
 
 static void
 umodem_start_write(struct ucom_softc *ucom)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 
 	usbd_transfer_start(sc->sc_xfer[UMODEM_BULK_WR]);
 }
 
 static void
 umodem_stop_write(struct ucom_softc *ucom)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 
 	usbd_transfer_stop(sc->sc_xfer[UMODEM_BULK_WR]);
 }
 
 static void
 umodem_get_caps(struct usb_attach_arg *uaa, uint8_t *cm, uint8_t *acm)
 {
 	struct usb_cdc_cm_descriptor *cmd;
 	struct usb_cdc_acm_descriptor *cad;
 
 	cmd = umodem_get_desc(uaa, UDESC_CS_INTERFACE, UDESCSUB_CDC_CM);
 	if ((cmd == NULL) || (cmd->bLength < sizeof(*cmd))) {
 		DPRINTF("no CM desc (faking one)\n");
 		*cm = USB_CDC_CM_DOES_CM | USB_CDC_CM_OVER_DATA;
 	} else
 		*cm = cmd->bmCapabilities;
 
 	cad = umodem_get_desc(uaa, UDESC_CS_INTERFACE, UDESCSUB_CDC_ACM);
 	if ((cad == NULL) || (cad->bLength < sizeof(*cad))) {
 		DPRINTF("no ACM desc\n");
 		*acm = 0;
 	} else
 		*acm = cad->bmCapabilities;
 }
 
 static void
 umodem_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 
 	DPRINTF("\n");
 
 	*lsr = sc->sc_lsr;
 	*msr = sc->sc_msr;
 }
 
 static int
 umodem_pre_param(struct ucom_softc *ucom, struct termios *t)
 {
 	return (0);			/* we accept anything */
 }
 
 static void
 umodem_cfg_param(struct ucom_softc *ucom, struct termios *t)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 	struct usb_cdc_line_state ls;
 	struct usb_device_request req;
 
 	DPRINTF("sc=%p\n", sc);
 
 	memset(&ls, 0, sizeof(ls));
 
 	USETDW(ls.dwDTERate, t->c_ospeed);
 
 	ls.bCharFormat = (t->c_cflag & CSTOPB) ?
 	    UCDC_STOP_BIT_2 : UCDC_STOP_BIT_1;
 
 	ls.bParityType = (t->c_cflag & PARENB) ?
 	    ((t->c_cflag & PARODD) ?
 	    UCDC_PARITY_ODD : UCDC_PARITY_EVEN) : UCDC_PARITY_NONE;
 
 	switch (t->c_cflag & CSIZE) {
 	case CS5:
 		ls.bDataBits = 5;
 		break;
 	case CS6:
 		ls.bDataBits = 6;
 		break;
 	case CS7:
 		ls.bDataBits = 7;
 		break;
 	case CS8:
 		ls.bDataBits = 8;
 		break;
 	}
 
 	DPRINTF("rate=%d fmt=%d parity=%d bits=%d\n",
 	    UGETDW(ls.dwDTERate), ls.bCharFormat,
 	    ls.bParityType, ls.bDataBits);
 
 	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 	req.bRequest = UCDC_SET_LINE_CODING;
 	USETW(req.wValue, 0);
 	req.wIndex[0] = sc->sc_ctrl_iface_no;
 	req.wIndex[1] = 0;
 	USETW(req.wLength, sizeof(ls));
 
 	ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, 
 	    &req, &ls, 0, 1000);
 }
 
 static int
 umodem_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data,
     int flag, struct thread *td)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 	int error = 0;
 
 	DPRINTF("cmd=0x%08x\n", cmd);
 
 	switch (cmd) {
 	case USB_GET_CM_OVER_DATA:
 		*(int *)data = sc->sc_cm_over_data;
 		break;
 
 	case USB_SET_CM_OVER_DATA:
 		if (*(int *)data != sc->sc_cm_over_data) {
 			/* XXX change it */
 		}
 		break;
 
 	default:
 		DPRINTF("unknown\n");
 		error = ENOIOCTL;
 		break;
 	}
 
 	return (error);
 }
 
 static void
 umodem_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 	struct usb_device_request req;
 
 	DPRINTF("onoff=%d\n", onoff);
 
 	if (onoff)
 		sc->sc_line |= UCDC_LINE_DTR;
 	else
 		sc->sc_line &= ~UCDC_LINE_DTR;
 
 	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 	req.bRequest = UCDC_SET_CONTROL_LINE_STATE;
 	USETW(req.wValue, sc->sc_line);
 	req.wIndex[0] = sc->sc_ctrl_iface_no;
 	req.wIndex[1] = 0;
 	USETW(req.wLength, 0);
 
 	ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, 
 	    &req, NULL, 0, 1000);
 }
 
 static void
 umodem_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 	struct usb_device_request req;
 
 	DPRINTF("onoff=%d\n", onoff);
 
 	if (onoff)
 		sc->sc_line |= UCDC_LINE_RTS;
 	else
 		sc->sc_line &= ~UCDC_LINE_RTS;
 
 	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 	req.bRequest = UCDC_SET_CONTROL_LINE_STATE;
 	USETW(req.wValue, sc->sc_line);
 	req.wIndex[0] = sc->sc_ctrl_iface_no;
 	req.wIndex[1] = 0;
 	USETW(req.wLength, 0);
 
 	ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, 
 	    &req, NULL, 0, 1000);
 }
 
 static void
 umodem_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 	struct usb_device_request req;
 	uint16_t temp;
 
 	DPRINTF("onoff=%d\n", onoff);
 
 	if (sc->sc_acm_cap & USB_CDC_ACM_HAS_BREAK) {
 
 		temp = onoff ? UCDC_BREAK_ON : UCDC_BREAK_OFF;
 
 		req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 		req.bRequest = UCDC_SEND_BREAK;
 		USETW(req.wValue, temp);
 		req.wIndex[0] = sc->sc_ctrl_iface_no;
 		req.wIndex[1] = 0;
 		USETW(req.wLength, 0);
 
 		ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, 
 		    &req, NULL, 0, 1000);
 	}
 }
 
 static void
 umodem_intr_callback(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct usb_cdc_notification pkt;
 	struct umodem_softc *sc = usbd_xfer_softc(xfer);
 	struct usb_page_cache *pc;
 	uint16_t wLen;
 	int actlen;
 
 	usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 
 		if (actlen < 8) {
 			DPRINTF("received short packet, "
 			    "%d bytes\n", actlen);
 			goto tr_setup;
 		}
 		if (actlen > (int)sizeof(pkt)) {
 			DPRINTF("truncating message\n");
 			actlen = sizeof(pkt);
 		}
 		pc = usbd_xfer_get_frame(xfer, 0);
 		usbd_copy_out(pc, 0, &pkt, actlen);
 
 		actlen -= 8;
 
 		wLen = UGETW(pkt.wLength);
 		if (actlen > wLen) {
 			actlen = wLen;
 		}
 		if (pkt.bmRequestType != UCDC_NOTIFICATION) {
 			DPRINTF("unknown message type, "
 			    "0x%02x, on notify pipe!\n",
 			    pkt.bmRequestType);
 			goto tr_setup;
 		}
 		switch (pkt.bNotification) {
 		case UCDC_N_SERIAL_STATE:
 			/*
 			 * Set the serial state in ucom driver based on
 			 * the bits from the notify message
 			 */
 			if (actlen < 2) {
 				DPRINTF("invalid notification "
 				    "length, %d bytes!\n", actlen);
 				break;
 			}
 			DPRINTF("notify bytes = %02x%02x\n",
 			    pkt.data[0],
 			    pkt.data[1]);
 
 			/* Currently, lsr is always zero. */
 			sc->sc_lsr = 0;
 			sc->sc_msr = 0;
 
 			if (pkt.data[0] & UCDC_N_SERIAL_RI) {
 				sc->sc_msr |= SER_RI;
 			}
 			if (pkt.data[0] & UCDC_N_SERIAL_DSR) {
 				sc->sc_msr |= SER_DSR;
 			}
 			if (pkt.data[0] & UCDC_N_SERIAL_DCD) {
 				sc->sc_msr |= SER_DCD;
 			}
 			ucom_status_change(&sc->sc_ucom);
 			break;
 
 		default:
 			DPRINTF("unknown notify message: 0x%02x\n",
 			    pkt.bNotification);
 			break;
 		}
 
 	case USB_ST_SETUP:
 tr_setup:
 		usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
 		usbd_transfer_submit(xfer);
 		return;
 
 	default:			/* Error */
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
 			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
 		return;
 
 	}
 }
 
 static void
 umodem_write_callback(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct umodem_softc *sc = usbd_xfer_softc(xfer);
 	struct usb_page_cache *pc;
 	uint32_t actlen;
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_SETUP:
 	case USB_ST_TRANSFERRED:
 tr_setup:
 		pc = usbd_xfer_get_frame(xfer, 0);
 		if (ucom_get_data(&sc->sc_ucom, pc, 0,
 		    UMODEM_BUF_SIZE, &actlen)) {
 
 			usbd_xfer_set_frame_len(xfer, 0, actlen);
 			usbd_transfer_submit(xfer);
 		}
 		return;
 
 	default:			/* Error */
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
 			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
 		return;
 	}
 }
 
 static void
 umodem_read_callback(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct umodem_softc *sc = usbd_xfer_softc(xfer);
 	struct usb_page_cache *pc;
 	int actlen;
 
 	usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 
 		DPRINTF("actlen=%d\n", actlen);
 
 		pc = usbd_xfer_get_frame(xfer, 0);
 		ucom_put_data(&sc->sc_ucom, pc, 0, actlen);
 
 	case USB_ST_SETUP:
 tr_setup:
 		usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
 		usbd_transfer_submit(xfer);
 		return;
 
 	default:			/* Error */
 		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
 			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
 		return;
 	}
 }
 
 static void *
 umodem_get_desc(struct usb_attach_arg *uaa, uint8_t type, uint8_t subtype)
 {
 	return (usbd_find_descriptor(uaa->device, NULL, uaa->info.bIfaceIndex,
 	    type, 0xFF, subtype, 0xFF));
 }
 
 static usb_error_t
 umodem_set_comm_feature(struct usb_device *udev, uint8_t iface_no,
     uint16_t feature, uint16_t state)
 {
 	struct usb_device_request req;
 	struct usb_cdc_abstract_state ast;
 
 	DPRINTF("feature=%d state=%d\n",
 	    feature, state);
 
 	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 	req.bRequest = UCDC_SET_COMM_FEATURE;
 	USETW(req.wValue, feature);
 	req.wIndex[0] = iface_no;
 	req.wIndex[1] = 0;
 	USETW(req.wLength, UCDC_ABSTRACT_STATE_LENGTH);
 	USETW(ast.wState, state);
 
 	return (usbd_do_request(udev, NULL, &req, &ast));
 }
 
 static int
 umodem_detach(device_t dev)
 {
 	struct umodem_softc *sc = device_get_softc(dev);
 
 	DPRINTF("sc=%p\n", sc);
 
 	ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom);
 	usbd_transfer_unsetup(sc->sc_xfer, UMODEM_N_TRANSFER);
 
 	device_claim_softc(dev);
 
 	umodem_free_softc(sc);
 
 	return (0);
 }
 
 UCOM_UNLOAD_DRAIN(umodem);
 
 static void
 umodem_free_softc(struct umodem_softc *sc)
 {
 	if (ucom_unref(&sc->sc_super_ucom)) {
 		mtx_destroy(&sc->sc_mtx);
 		device_free_softc(sc);
 	}
 }
 
 static void
 umodem_free(struct ucom_softc *ucom)
 {
 	umodem_free_softc(ucom->sc_parent);
 }
 
 static void
 umodem_poll(struct ucom_softc *ucom)
 {
 	struct umodem_softc *sc = ucom->sc_parent;
 	usbd_transfer_poll(sc->sc_xfer, UMODEM_N_TRANSFER);
 }
Index: stable/10
===================================================================
--- stable/10	(revision 276242)
+++ stable/10	(revision 276243)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r275790-275791