[Glibc-bsd-commits] r3506 - in trunk/freebsd-utils/debian: . patches

Robert Millan rmh at alioth.debian.org
Wed Jun 29 14:09:07 UTC 2011


Author: rmh
Date: 2011-06-29 14:08:58 +0000 (Wed, 29 Jun 2011)
New Revision: 3506

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/033_devd_usb.diff
Log:
  * Fix broken usb.conf.  It needs to be generated using usbdevs from
    HEAD, or otherwise empty variables act as catch-all rules.  Getting
    rid of autogeneration since upstream doesn't seem interested in using
    devd variables anyway (see PR 157903).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-06-29 11:11:59 UTC (rev 3505)
+++ trunk/freebsd-utils/debian/changelog	2011-06-29 14:08:58 UTC (rev 3506)
@@ -1,3 +1,12 @@
+freebsd-utils (8.2+ds1-2) UNRELEASED; urgency=low
+
+  * Fix broken usb.conf.  It needs to be generated using usbdevs from
+    HEAD, or otherwise empty variables act as catch-all rules.  Getting
+    rid of autogeneration since upstream doesn't seem interested in using
+    devd variables anyway (see PR 157903).
+
+ -- Robert Millan <rmh at debian.org>  Wed, 29 Jun 2011 15:30:54 +0200
+
 freebsd-utils (8.2+ds1-1) unstable; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/freebsd-utils/debian/patches/033_devd_usb.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/033_devd_usb.diff	2011-06-29 11:11:59 UTC (rev 3505)
+++ trunk/freebsd-utils/debian/patches/033_devd_usb.diff	2011-06-29 14:08:58 UTC (rev 3506)
@@ -43,2771 +43,2738 @@
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_3COM";
-+	match "product" "$USB_PRODUCT_3COM_3C460B";
++	match "vendor" "0x0506";
++	match "product" "0x4601";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ABOCOM";
-+	match "product" "($USB_PRODUCT_ABOCOM_DSB650TX_PNA|$USB_PRODUCT_ABOCOM_UFE1000|$USB_PRODUCT_ABOCOM_XX1|$USB_PRODUCT_ABOCOM_XX10|$USB_PRODUCT_ABOCOM_XX2|$USB_PRODUCT_ABOCOM_XX4|$USB_PRODUCT_ABOCOM_XX5|$USB_PRODUCT_ABOCOM_XX6|$USB_PRODUCT_ABOCOM_XX7|$USB_PRODUCT_ABOCOM_XX8|$USB_PRODUCT_ABOCOM_XX9)";
++	match "vendor" "0x07b8";
++	match "product" "(0x4003|0x4002|0x110c|0xabc1|0x200c|0x4004|0x4007|0x400b|0x400c|0x4102|0x4104)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACCTON";
-+	match "product" "($USB_PRODUCT_ACCTON_SS1001|$USB_PRODUCT_ACCTON_USB320_EC)";
++	match "vendor" "0x083a";
++	match "product" "(0x5046|0x1046)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ADMTEK";
-+	match "product" "($USB_PRODUCT_ADMTEK_PEGASUS|$USB_PRODUCT_ADMTEK_PEGASUSII|$USB_PRODUCT_ADMTEK_PEGASUSII_2|$USB_PRODUCT_ADMTEK_PEGASUSII_3|$USB_PRODUCT_ADMTEK_PEGASUSII_4)";
++	match "vendor" "0x07a6";
++	match "product" "(0x0986|0x8511|0x8513|0x8515|0x07c2)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AEI";
-+	match "product" "$USB_PRODUCT_AEI_FASTETHERNET";
++	match "vendor" "0x3334";
++	match "product" "0x1701";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ALLIEDTELESYN";
-+	match "product" "$USB_PRODUCT_ALLIEDTELESYN_ATUSB100";
++	match "vendor" "0x07c9";
++	match "product" "0xb100";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ATEN";
-+	match "product" "$USB_PRODUCT_ATEN_UC110T";
++	match "vendor" "0x0557";
++	match "product" "0x2007";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "$USB_PRODUCT_BELKIN_USB2LAN";
++	match "vendor" "0x050d";
++	match "product" "0x0121";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BILLIONTON";
-+	match "product" "($USB_PRODUCT_BILLIONTON_USB100|$USB_PRODUCT_BILLIONTON_USBE100|$USB_PRODUCT_BILLIONTON_USBEL100|$USB_PRODUCT_BILLIONTON_USBLP100)";
++	match "vendor" "0x08dd";
++	match "product" "(0x0986|0x8511|0x0988|0x0987)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_COREGA";
-+	match "product" "($USB_PRODUCT_COREGA_FETHER_USB_TX|$USB_PRODUCT_COREGA_FETHER_USB_TXS)";
++	match "vendor" "0x07aa";
++	match "product" "(0x0004|0x000d)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DLINK";
-+	match "product" "($USB_PRODUCT_DLINK_DSB650|$USB_PRODUCT_DLINK_DSB650TX|$USB_PRODUCT_DLINK_DSB650TX1|$USB_PRODUCT_DLINK_DSB650TX2|$USB_PRODUCT_DLINK_DSB650TX3|$USB_PRODUCT_DLINK_DSB650TX4|$USB_PRODUCT_DLINK_DSB650TX_PNA)";
++	match "vendor" "0x2001";
++	match "product" "(0xabc1|0x4002|0x4001|0x4102|0x400b|0x200c|0x4003)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ELCON";
-+	match "product" "$USB_PRODUCT_ELCON_PLAN";
++	match "vendor" "0x0db7";
++	match "product" "0x0002";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ELECOM";
-+	match "product" "($USB_PRODUCT_ELECOM_LDUSB20|$USB_PRODUCT_ELECOM_LDUSBLTX|$USB_PRODUCT_ELECOM_LDUSBTX0|$USB_PRODUCT_ELECOM_LDUSBTX1|$USB_PRODUCT_ELECOM_LDUSBTX2|$USB_PRODUCT_ELECOM_LDUSBTX3)";
++	match "vendor" "0x056e";
++	match "product" "(0x4010|0x4005|0x200c|0x4002|0x400b|0xabc1)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ELSA";
-+	match "product" "$USB_PRODUCT_ELSA_USB2ETHERNET";
++	match "vendor" "0x05cc";
++	match "product" "0x3000";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GIGABYTE";
-+	match "product" "$USB_PRODUCT_GIGABYTE_GNBR402W";
++	match "vendor" "0x1044";
++	match "product" "0x8002";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HAWKING";
-+	match "product" "$USB_PRODUCT_HAWKING_UF100";
++	match "vendor" "0x0e66";
++	match "product" "0x400c";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HP";
-+	match "product" "$USB_PRODUCT_HP_HN210E";
++	match "vendor" "0x03f0";
++	match "product" "0x811c";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_IODATA";
-+	match "product" "($USB_PRODUCT_IODATA_USBETTX|$USB_PRODUCT_IODATA_USBETTXS)";
++	match "vendor" "0x04bb";
++	match "product" "(0x0904|0x0913)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_KINGSTON";
-+	match "product" "$USB_PRODUCT_KINGSTON_KNU101TX";
++	match "vendor" "0x0951";
++	match "product" "0x000a";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_LINKSYS";
-+	match "product" "($USB_PRODUCT_LINKSYS_USB100H1|$USB_PRODUCT_LINKSYS_USB100TX|$USB_PRODUCT_LINKSYS_USB10T|$USB_PRODUCT_LINKSYS_USB10TA|$USB_PRODUCT_LINKSYS_USB10TX1|$USB_PRODUCT_LINKSYS_USB10TX2)";
++	match "vendor" "0x066b";
++	match "product" "(0x2204|0x2203|0x2202|0x2206|0x200c|0x400b)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MELCO";
-+	match "product" "($USB_PRODUCT_MELCO_LUA2TX5|$USB_PRODUCT_MELCO_LUATX1|$USB_PRODUCT_MELCO_LUATX5)";
++	match "vendor" "0x0411";
++	match "product" "(0x0009|0x0001|0x0005)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MICROSOFT";
-+	match "product" "$USB_PRODUCT_MICROSOFT_MN110";
++	match "vendor" "0x045e";
++	match "product" "0x007a";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NETGEAR";
-+	match "product" "$USB_PRODUCT_NETGEAR_FA101";
++	match "vendor" "0x0846";
++	match "product" "0x1020";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SIEMENS";
-+	match "product" "$USB_PRODUCT_SIEMENS_SPEEDSTREAM";
++	match "vendor" "0x067c";
++	match "product" "0x1001";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SIIG2";
-+	match "product" "$USB_PRODUCT_SIIG2_USBTOETHER";
++	match "vendor" "0x0b39";
++	match "product" "0x0109";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SMARTBRIDGES";
-+	match "product" "$USB_PRODUCT_SMARTBRIDGES_SMARTNIC";
++	match "vendor" "0x08d1";
++	match "product" "0x0003";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SMC";
-+	match "product" "($USB_PRODUCT_SMC_2202USB|$USB_PRODUCT_SMC_2206USB)";
++	match "vendor" "0x0707";
++	match "product" "(0x0200|0x0201)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SOHOWARE";
-+	match "product" "($USB_PRODUCT_SOHOWARE_NUB100|$USB_PRODUCT_SOHOWARE_NUB110)";
++	match "vendor" "0x15e8";
++	match "product" "(0x9100|0x9110)";
 +	action "kldload if_aue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ABOCOM";
-+	match "product" "$USB_PRODUCT_ABOCOM_UF200";
++	match "vendor" "0x07b8";
++	match "product" "0x420a";
 +	action "kldload if_axe";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACERCM";
-+	match "product" "$USB_PRODUCT_ACERCM_EP1427X2";
++	match "vendor" "0x1189";
++	match "product" "0x0893";
 +	action "kldload if_axe";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_APPLE";
-+	match "product" "$USB_PRODUCT_APPLE_ETHERNET";
++	match "vendor" "0x05ac";
++	match "product" "0x1402";
 +	action "kldload if_axe";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASIX";
-+	match "product" "($USB_PRODUCT_ASIX_AX88172|$USB_PRODUCT_ASIX_AX88178|$USB_PRODUCT_ASIX_AX88772|$USB_PRODUCT_ASIX_AX88772A|$USB_PRODUCT_ATEN_UC210T)";
++	match "vendor" "0x0b95";
++	match "product" "(0x1720|0x1780|0x7720|0x772a|0x2009)";
 +	action "kldload if_axe";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "$USB_PRODUCT_BELKIN_F5D5055";
++	match "vendor" "0x050d";
++	match "product" "0x5055";
 +	action "kldload if_axe";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BILLIONTON";
-+	match "product" "$USB_PRODUCT_BILLIONTON_USB2AR";
++	match "vendor" "0x08dd";
++	match "product" "0x90ff";
 +	action "kldload if_axe";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACERLABS";
-+	match "product" "$USB_PRODUCT_ACERLABS_M5632";
++	match "vendor" "0x0402";
++	match "product" "0x5632";
 +	action "kldload if_cdce";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AMBIT";
-+	match "product" "$USB_PRODUCT_AMBIT_NTL_250";
++	match "vendor" "0x0bb2";
++	match "product" "0x6098";
 +	action "kldload if_cdce";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_COMPAQ";
-+	match "product" "$USB_PRODUCT_COMPAQ_IPAQLINUX";
++	match "vendor" "0x049f";
++	match "product" "0x505a";
 +	action "kldload if_cdce";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GMATE";
-+	match "product" "$USB_PRODUCT_GMATE_YP3X00";
++	match "vendor" "0x0e7e";
++	match "product" "0x1001";
 +	action "kldload if_cdce";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MOTOROLA2";
-+	match "product" "($USB_PRODUCT_MOTOROLA2_USBLAN|$USB_PRODUCT_MOTOROLA2_USBLAN2)";
++	match "vendor" "0x22b8";
++	match "product" "(0x600c|0x6027)";
 +	action "kldload if_cdce";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NETCHIP";
-+	match "product" "$USB_PRODUCT_NETCHIP_ETHERNETGADGET";
++	match "vendor" "0x0525";
++	match "product" "0xa4a2";
 +	action "kldload if_cdce";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PROLIFIC";
-+	match "product" "$USB_PRODUCT_PROLIFIC_PL2501";
++	match "vendor" "0x067b";
++	match "product" "0x2501";
 +	action "kldload if_cdce";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SHARP";
-+	match "product" "($USB_PRODUCT_SHARP_SL5500|$USB_PRODUCT_SHARP_SL5600|$USB_PRODUCT_SHARP_SLA300|$USB_PRODUCT_SHARP_SLC700|$USB_PRODUCT_SHARP_SLC750)";
++	match "vendor" "0x04dd";
++	match "product" "(0x8004|0x8006|0x8005|0x8007|0x9031)";
 +	action "kldload if_cdce";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CATC";
-+	match "product" "($USB_PRODUCT_CATC_NETMATE|$USB_PRODUCT_CATC_NETMATE2)";
++	match "vendor" "0x0423";
++	match "product" "(0x000a|0x000c)";
 +	action "kldload if_cue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SMARTBRIDGES";
-+	match "product" "$USB_PRODUCT_SMARTBRIDGES_SMARTLINK";
++	match "vendor" "0x08d1";
++	match "product" "0x0001";
 +	action "kldload if_cue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_APPLE";
-+	match "product" "($USB_PRODUCT_APPLE_IPHONE|$USB_PRODUCT_APPLE_IPHONE_3G|$USB_PRODUCT_APPLE_IPHONE_3GS|$USB_PRODUCT_APPLE_IPHONE_4)";
++	match "vendor" "0x05ac";
++	match "product" "(0x1290|0x1292|0x1294|0x1297)";
 +	action "kldload if_ipheth";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_3COM";
-+	match "product" "($USB_PRODUCT_3COM_3C19250|$USB_PRODUCT_3COM_3C460)";
++	match "vendor" "0x0506";
++	match "product" "(0x03e8|0x11f8)";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ABOCOM";
-+	match "product" "$USB_PRODUCT_ABOCOM_URE450";
++	match "vendor" "0x07b8";
++	match "product" "0x4000";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ADS";
-+	match "product" "($USB_PRODUCT_ADS_UBS10BT|$USB_PRODUCT_ADS_UBS10BTX)";
++	match "vendor" "0x06e1";
++	match "product" "(0x0008|0x0009)";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AOX";
-+	match "product" "$USB_PRODUCT_AOX_USB101";
++	match "vendor" "0x03e8";
++	match "product" "0x0008";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASANTE";
-+	match "product" "$USB_PRODUCT_ASANTE_EA";
++	match "vendor" "0x10bd";
++	match "product" "0x1427";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ATEN";
-+	match "product" "($USB_PRODUCT_ATEN_DSB650C|$USB_PRODUCT_ATEN_UC10T)";
++	match "vendor" "0x0557";
++	match "product" "(0x4000|0x2002)";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_COREGA";
-+	match "product" "$USB_PRODUCT_COREGA_ETHER_USB_T";
++	match "vendor" "0x07aa";
++	match "product" "0x0001";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DLINK";
-+	match "product" "$USB_PRODUCT_DLINK_DSB650C";
++	match "vendor" "0x2001";
++	match "product" "0x4000";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ENTREGA";
-+	match "product" "($USB_PRODUCT_ENTREGA_E45|$USB_PRODUCT_ENTREGA_XX1|$USB_PRODUCT_ENTREGA_XX2)";
++	match "vendor" "0x1645";
++	match "product" "(0x0005|0x0008|0x8005)";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_IODATA";
-+	match "product" "$USB_PRODUCT_IODATA_USBETT";
++	match "vendor" "0x04bb";
++	match "product" "0x0901";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_JATON";
-+	match "product" "$USB_PRODUCT_JATON_EDA";
++	match "vendor" "0x087d";
++	match "product" "0x5704";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_KINGSTON";
-+	match "product" "$USB_PRODUCT_KINGSTON_XX1";
++	match "vendor" "0x0951";
++	match "product" "0x0008";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_KLSI";
-+	match "product" "($USB_PRODUCT_KLSI_DUH3E10BT|$USB_PRODUCT_KLSI_DUH3E10BTN)";
++	match "vendor" "0x05e9";
++	match "product" "(0x0008|0x0009)";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_LINKSYS";
-+	match "product" "$USB_PRODUCT_LINKSYS_USB10T";
++	match "vendor" "0x066b";
++	match "product" "0x2202";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MOBILITY";
-+	match "product" "$USB_PRODUCT_MOBILITY_EA";
++	match "vendor" "0x1342";
++	match "product" "0x0204";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NETGEAR";
-+	match "product" "($USB_PRODUCT_NETGEAR_EA101|$USB_PRODUCT_NETGEAR_EA101X)";
++	match "vendor" "0x0846";
++	match "product" "(0x1001|0x1002)";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PERACOM";
-+	match "product" "($USB_PRODUCT_PERACOM_ENET|$USB_PRODUCT_PERACOM_ENET2|$USB_PRODUCT_PERACOM_ENET3)";
++	match "vendor" "0x0565";
++	match "product" "(0x0002|0x0005|0x0003)";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PORTGEAR";
-+	match "product" "($USB_PRODUCT_PORTGEAR_EA8|$USB_PRODUCT_PORTGEAR_EA9)";
++	match "vendor" "0x085a";
++	match "product" "(0x0008|0x0009)";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PORTSMITH";
-+	match "product" "$USB_PRODUCT_PORTSMITH_EEA";
++	match "vendor" "0x095a";
++	match "product" "0x3003";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SHARK";
-+	match "product" "$USB_PRODUCT_SHARK_PA";
++	match "vendor" "0x13d2";
++	match "product" "0x0400";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SILICOM";
-+	match "product" "($USB_PRODUCT_SILICOM_GPE|$USB_PRODUCT_SILICOM_U2E)";
++	match "vendor" "0x1485";
++	match "product" "(0x0002|0x0001)";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SMC";
-+	match "product" "$USB_PRODUCT_SMC_2102USB";
++	match "vendor" "0x0707";
++	match "product" "0x0100";
 +	action "kldload if_kue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MOSCHIP";
-+	match "product" "($USB_PRODUCT_MOSCHIP_MCS7730|$USB_PRODUCT_MOSCHIP_MCS7830)";
++	match "vendor" "0x9710";
++	match "product" "(0x7730|0x7830)";
 +	action "kldload if_mos";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SITECOMEU";
-+	match "product" "$USB_PRODUCT_SITECOMEU_LN030";
++	match "vendor" "0x0df6";
++	match "product" "0x0021";
 +	action "kldload if_mos";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MELCO";
-+	match "product" "$USB_PRODUCT_MELCO_LUAKTX";
++	match "vendor" "0x0411";
++	match "product" "0x0012";
 +	action "kldload if_rue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_REALTEK";
-+	match "product" "$USB_PRODUCT_REALTEK_USBKR100";
++	match "vendor" "0x0bda";
++	match "product" "0x8150";
 +	action "kldload if_rue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_OQO";
-+	match "product" "$USB_PRODUCT_OQO_ETHER01";
++	match "vendor" "0x1557";
++	match "product" "0x8150";
 +	action "kldload if_rue";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ABOCOM";
-+	match "product" "($USB_PRODUCT_ABOCOM_HWU54DM|$USB_PRODUCT_ABOCOM_RT2573_2|$USB_PRODUCT_ABOCOM_RT2573_3|$USB_PRODUCT_ABOCOM_RT2573_4|$USB_PRODUCT_ABOCOM_WUG2700)";
++	match "vendor" "0x07b8";
++	match "product" "(0xb21b|0xb21c|0xb21d|0xb21e|0xb21f)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AMIT";
-+	match "product" "$USB_PRODUCT_AMIT_CGWLUSB2GO";
++	match "vendor" "0x18c5";
++	match "product" "0x0002";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASUS";
-+	match "product" "($USB_PRODUCT_ASUS_RT2573_1|$USB_PRODUCT_ASUS_RT2573_2$USB_PRODUCT_BELKIN $USB_PRODUCT_BELKIN_F5D7050A|$USB_PRODUCT_BELKIN_F5D9050V3)";
++	match "vendor" "0x0b05";
++	match "product" "(0x1723|$USB_PRODUCT_ASUS_RT2573_2$USB_PRODUCT_BELKIN 0x705a|0x905b)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CISCOLINKSYS";
-+	match "product" "($USB_PRODUCT_CISCOLINKSYS_WUSB54GC|$USB_PRODUCT_CISCOLINKSYS_WUSB54GR$USB_PRODUCT_CONCEPTRONIC2 $USB_PRODUCT_CONCEPTRONIC2_C54RU2)";
++	match "vendor" "0x13b1";
++	match "product" "(0x0020|$USB_PRODUCT_CISCOLINKSYS_WUSB54GR$USB_PRODUCT_CONCEPTRONIC2 0x3c22)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_COREGA";
-+	match "product" "($USB_PRODUCT_COREGA_CGWLUSB2GL|$USB_PRODUCT_COREGA_CGWLUSB2GPX)";
++	match "vendor" "0x07aa";
++	match "product" "(0x002d|0x002e)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DICKSMITH";
-+	match "product" "($USB_PRODUCT_DICKSMITH_CWD854F|$USB_PRODUCT_DICKSMITH_RT2573)";
++	match "vendor" "0x1371";
++	match "product" "(0x9032|0x9022)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_EDIMAX";
-+	match "product" "$USB_PRODUCT_EDIMAX_EW7318USG";
++	match "vendor" "0x7392";
++	match "product" "0x7318";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DLINK2";
-+	match "product" "($USB_PRODUCT_DLINK2_DWLG122C1|$USB_PRODUCT_DLINK2_WUA1340|$USB_PRODUCT_DLINK2_DWA111|$USB_PRODUCT_DLINK2_DWA110)";
++	match "vendor" "0x07d1";
++	match "product" "(0x3c03|0x3c04|0x3c06|0x3c07)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GIGABYTE";
-+	match "product" "($USB_PRODUCT_GIGABYTE_GNWB01GS|$USB_PRODUCT_GIGABYTE_GNWI05GS)";
++	match "vendor" "0x1044";
++	match "product" "(0x8008|0x800a)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GIGASET";
-+	match "product" "$USB_PRODUCT_GIGASET_RT2573";
++	match "vendor" "0x1690";
++	match "product" "0x0722";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GOODWAY";
-+	match "product" "$USB_PRODUCT_GOODWAY_RT2573";
++	match "vendor" "0x1631";
++	match "product" "0xc019";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GUILLEMOT";
-+	match "product" "($USB_PRODUCT_GUILLEMOT_HWGUSB254LB|$USB_PRODUCT_GUILLEMOT_HWGUSB254V2AP)";
++	match "vendor" "0x06f8";
++	match "product" "(0xe010|0xe020)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HUAWEI3COM";
-+	match "product" "$USB_PRODUCT_HUAWEI3COM_WUB320G";
++	match "vendor" "0x1472";
++	match "product" "0x0009";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MELCO";
-+	match "product" "($USB_PRODUCT_MELCO_G54HP|$USB_PRODUCT_MELCO_SG54HP|$USB_PRODUCT_MELCO_WLIUCG|$USB_PRODUCT_MELCO_WLRUCG|$USB_PRODUCT_MELCO_WLRUCGAOSS)";
++	match "vendor" "0x0411";
++	match "product" "(0x00d9|0x00d8|0x0137|0x0116|0x0119)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MSI";
-+	match "product" "($USB_PRODUCT_MSI_RT2573_1|$USB_PRODUCT_MSI_RT2573_2|$USB_PRODUCT_MSI_RT2573_3|$USB_PRODUCT_MSI_RT2573_4)";
++	match "vendor" "0x0db0";
++	match "product" "(0x6874|0x6877|0xa861|0xa874)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NOVATECH";
-+	match "product" "$USB_PRODUCT_NOVATECH_RT2573";
++	match "vendor" "0x0eb0";
++	match "product" "0x9021";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PLANEX2";
-+	match "product" "($USB_PRODUCT_PLANEX2_GWUS54HP|$USB_PRODUCT_PLANEX2_GWUS54MINI2|$USB_PRODUCT_PLANEX2_GWUSMM)";
++	match "vendor" "0x2019";
++	match "product" "(0xab01|0xab50|0xed02)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_QCOM";
-+	match "product" "($USB_PRODUCT_QCOM_RT2573|$USB_PRODUCT_QCOM_RT2573_2|$USB_PRODUCT_QCOM_RT2573_3)";
++	match "vendor" "0x18e8";
++	match "product" "(0x6196|0x6229|0x6238)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_RALINK";
-+	match "product" "($USB_PRODUCT_RALINK_RT2573|$USB_PRODUCT_RALINK_RT2573_2|$USB_PRODUCT_RALINK_RT2671)";
++	match "vendor" "0x148f";
++	match "product" "(0x2573|0x9021|0x2671)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SITECOMEU";
-+	match "product" "($USB_PRODUCT_SITECOMEU_WL113R2|$USB_PRODUCT_SITECOMEU_WL172)";
++	match "vendor" "0x0df6";
++	match "product" "(0x9712|0x90ac)";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SPARKLAN";
-+	match "product" "$USB_PRODUCT_SPARKLAN_RT2573";
++	match "vendor" "0x15a9";
++	match "product" "0x0004";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SURECOM";
-+	match "product" "$USB_PRODUCT_SURECOM_RT2573";
++	match "vendor" "0x0769";
++	match "product" "0x31f3";
 +	action "kldload if_rum";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ABOCOM";
-+	match "product" "($USB_PRODUCT_ABOCOM_RT2770|$USB_PRODUCT_ABOCOM_RT2870|$USB_PRODUCT_ABOCOM_RT3070|$USB_PRODUCT_ABOCOM_RT3071|$USB_PRODUCT_ABOCOM_RT3072)";
++	match "vendor" "0x07b8";
++	match "product" "(0x2770|0x2870|0x3070|0x3071|0x3072)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ABOCOM2";
-+	match "product" "$USB_PRODUCT_ABOCOM2_RT2870_1";
++	match "vendor" "0x1482";
++	match "product" "0x3c09";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACCTON";
-+	match "product" "($USB_PRODUCT_ACCTON_RT2770|$USB_PRODUCT_ACCTON_RT2870_1|$USB_PRODUCT_ACCTON_RT2870_2|$USB_PRODUCT_ACCTON_RT2870_3|$USB_PRODUCT_ACCTON_RT2870_4|$USB_PRODUCT_ACCTON_RT2870_5|$USB_PRODUCT_ACCTON_RT3070|$USB_PRODUCT_ACCTON_RT3070_1|$USB_PRODUCT_ACCTON_RT3070_2|$USB_PRODUCT_ACCTON_RT3070_3|$USB_PRODUCT_ACCTON_RT3070_4|$USB_PRODUCT_ACCTON_RT3070_5)";
++	match "vendor" "0x083a";
++	match "product" "(0x7512|0xb522|0x6618|0x7522|0xa618|0x8522|0x7511|0xa701|0xa702|0xc522|0xa512|0xd522)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AIRTIES";
-+	match "product" "$USB_PRODUCT_AIRTIES_RT3070";
++	match "vendor" "0x1eda";
++	match "product" "0x2310";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ALLWIN";
-+	match "product" "($USB_PRODUCT_ALLWIN_RT2070|$USB_PRODUCT_ALLWIN_RT2770|$USB_PRODUCT_ALLWIN_RT2870|$USB_PRODUCT_ALLWIN_RT3070|$USB_PRODUCT_ALLWIN_RT3071|$USB_PRODUCT_ALLWIN_RT3072|$USB_PRODUCT_ALLWIN_RT3572)";
++	match "vendor" "0x8516";
++	match "product" "(0x2070|0x2770|0x2870|0x3070|0x3071|0x3072|0x3572)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AMIGO";
-+	match "product" "($USB_PRODUCT_AMIGO_RT2870_1|$USB_PRODUCT_AMIGO_RT2870_2)";
++	match "vendor" "0x0e0b";
++	match "product" "(0x9031|0x9041)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AMIT";
-+	match "product" "($USB_PRODUCT_AMIT_CGWLUSB2GNR|$USB_PRODUCT_AMIT_RT2870_1)";
++	match "vendor" "0x18c5";
++	match "product" "(0x0008|0x0012)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AMIT2";
-+	match "product" "$USB_PRODUCT_AMIT2_RT2870";
++	match "vendor" "0x15c5";
++	match "product" "0x0008";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASUS";
-+	match "product" "($USB_PRODUCT_ASUS_RT2870_1|$USB_PRODUCT_ASUS_RT2870_2|$USB_PRODUCT_ASUS_RT2870_3|$USB_PRODUCT_ASUS_RT2870_4|$USB_PRODUCT_ASUS_RT2870_5|$USB_PRODUCT_ASUS_USBN13|$USB_PRODUCT_ASUS_RT3070_1)";
++	match "vendor" "0x0b05";
++	match "product" "(0x1731|0x1732|0x1742|0x1760|0x1761|0x1784|0x1790)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASUS2";
-+	match "product" "$USB_PRODUCT_ASUS2_USBN11";
++	match "vendor" "0x1761";
++	match "product" "0x0b05";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AZUREWAVE";
-+	match "product" "($USB_PRODUCT_AZUREWAVE_RT2870_1|$USB_PRODUCT_AZUREWAVE_RT2870_2|$USB_PRODUCT_AZUREWAVE_RT3070_1|$USB_PRODUCT_AZUREWAVE_RT3070_2|$USB_PRODUCT_AZUREWAVE_RT3070_3)";
++	match "vendor" "0x13d3";
++	match "product" "(0x3247|0x3262|0x3273|0x3284|0x3305)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "($USB_PRODUCT_BELKIN_F5D8053V3|$USB_PRODUCT_BELKIN_F5D8055|$USB_PRODUCT_BELKIN_F6D4050V1|$USB_PRODUCT_BELKIN_RT2870_1|$USB_PRODUCT_BELKIN_RT2870_2)";
++	match "vendor" "0x050d";
++	match "product" "(0x815c|0x825a|0x935a|0x8053|0x805c)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CISCOLINKSYS2";
-+	match "product" "$USB_PRODUCT_CISCOLINKSYS2_RT3070";
++	match "vendor" "0x167b";
++	match "product" "0x4001";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CISCOLINKSYS3";
-+	match "product" "$USB_PRODUCT_CISCOLINKSYS3_RT3070";
++	match "vendor" "0x05a6";
++	match "product" "0x0101";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CONCEPTRONIC2";
-+	match "product" "($USB_PRODUCT_CONCEPTRONIC2_RT2870_1|$USB_PRODUCT_CONCEPTRONIC2_RT2870_2|$USB_PRODUCT_CONCEPTRONIC2_RT2870_3|$USB_PRODUCT_CONCEPTRONIC2_RT2870_4|$USB_PRODUCT_CONCEPTRONIC2_RT2870_5|$USB_PRODUCT_CONCEPTRONIC2_RT2870_6|$USB_PRODUCT_CONCEPTRONIC2_RT2870_7|$USB_PRODUCT_CONCEPTRONIC2_RT2870_8|$USB_PRODUCT_CONCEPTRONIC2_RT3070_1|$USB_PRODUCT_CONCEPTRONIC2_RT3070_2|$USB_PRODUCT_CONCEPTRONIC2_VIGORN61)";
++	match "vendor" "0x14b2";
++	match "product" "(0x3c06|0x3c07|0x3c23|0x3c25|0x3c27|0x3c28|0x3c09|0x3c12|0x3c08|0x3c11|0x3c25)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_COREGA";
-+	match "product" "($USB_PRODUCT_COREGA_CGWLUSB300GNM|$USB_PRODUCT_COREGA_RT2870_1|$USB_PRODUCT_COREGA_RT2870_2|$USB_PRODUCT_COREGA_RT2870_3|$USB_PRODUCT_COREGA_RT3070)";
++	match "vendor" "0x07aa";
++	match "product" "(0x0042|0x002f|0x003c|0x003f|0x0041)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CYBERTAN";
-+	match "product" "$USB_PRODUCT_CYBERTAN_RT2870";
++	match "vendor" "0x129b";
++	match "product" "0x1828";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DLINK";
-+	match "product" "($USB_PRODUCT_DLINK_RT2870|$USB_PRODUCT_DLINK_RT3072)";
++	match "vendor" "0x2001";
++	match "product" "(0x3c09|0x3c0a)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DLINK2";
-+	match "product" "($USB_PRODUCT_DLINK2_DWA130|$USB_PRODUCT_DLINK2_RT2870_1|$USB_PRODUCT_DLINK2_RT2870_2|$USB_PRODUCT_DLINK2_RT3070_1|$USB_PRODUCT_DLINK2_RT3070_2|$USB_PRODUCT_DLINK2_RT3070_3|$USB_PRODUCT_DLINK2_RT3070_4|$USB_PRODUCT_DLINK2_RT3070_5|$USB_PRODUCT_DLINK2_RT3072|$USB_PRODUCT_DLINK2_RT3072_1)";
++	match "vendor" "0x07d1";
++	match "product" "(0x3c13|0x3c09|0x3c11|0x3c0d|0x3c0e|0x3c0f|0x3c15|0x3c16|0x3c0a|0x3c0b)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_EDIMAX";
-+	match "product" "($USB_PRODUCT_EDIMAX_EW7717|$USB_PRODUCT_EDIMAX_EW7718|$USB_PRODUCT_EDIMAX_RT2870_1)";
++	match "vendor" "0x7392";
++	match "product" "(0x7717|0x7718|0x7711)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ENCORE";
-+	match "product" "($USB_PRODUCT_ENCORE_RT3070_1|$USB_PRODUCT_ENCORE_RT3070_2|$USB_PRODUCT_ENCORE_RT3070_3)";
++	match "vendor" "0x203d";
++	match "product" "(0x1480|0x14a1|0x14a9)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GIGABYTE";
-+	match "product" "($USB_PRODUCT_GIGABYTE_GNWB31N|$USB_PRODUCT_GIGABYTE_GNWB32L|$USB_PRODUCT_GIGABYTE_RT2870_1)";
++	match "vendor" "0x1044";
++	match "product" "(0x800c|0x800d|0x800b)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GIGASET";
-+	match "product" "($USB_PRODUCT_GIGASET_RT3070_1|$USB_PRODUCT_GIGASET_RT3070_2)";
++	match "vendor" "0x1690";
++	match "product" "(0x0740|0x0744)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GUILLEMOT";
-+	match "product" "$USB_PRODUCT_GUILLEMOT_HWNU300";
++	match "vendor" "0x06f8";
++	match "product" "0xe030";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HAWKING";
-+	match "product" "($USB_PRODUCT_HAWKING_HWUN2|$USB_PRODUCT_HAWKING_RT2870_1|$USB_PRODUCT_HAWKING_RT2870_2|$USB_PRODUCT_HAWKING_RT3070)";
++	match "vendor" "0x0e66";
++	match "product" "(0x0009|0x0001|0x0003|0x000b)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_IODATA";
-+	match "product" "($USB_PRODUCT_IODATA_RT3072_1|$USB_PRODUCT_IODATA_RT3072_2|$USB_PRODUCT_IODATA_RT3072_3|$USB_PRODUCT_IODATA_RT3072_4)";
++	match "vendor" "0x04bb";
++	match "product" "(0x0944|0x0945|0x0947|0x0948)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_LINKSYS4";
-+	match "product" "($USB_PRODUCT_LINKSYS4_RT3070|$USB_PRODUCT_LINKSYS4_WUSB100|$USB_PRODUCT_LINKSYS4_WUSB54GCV3|$USB_PRODUCT_LINKSYS4_WUSB600N|$USB_PRODUCT_LINKSYS4_WUSB600NV2)";
++	match "vendor" "0x1737";
++	match "product" "(0x0078|0x0070|0x0077|0x0071|0x0079)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_LOGITEC";
-+	match "product" "($USB_PRODUCT_LOGITEC_RT2870_1|$USB_PRODUCT_LOGITEC_RT2870_2|$USB_PRODUCT_LOGITEC_RT2870_3)";
++	match "vendor" "0x0789";
++	match "product" "(0x0162|0x0163|0x0164)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MELCO";
-+	match "product" "($USB_PRODUCT_MELCO_RT2870_1|$USB_PRODUCT_MELCO_RT2870_2|$USB_PRODUCT_MELCO_WLIUCAG300N|$USB_PRODUCT_MELCO_WLIUCG300N|$USB_PRODUCT_MELCO_WLIUCG301N|$USB_PRODUCT_MELCO_WLIUCGN)";
++	match "vendor" "0x0411";
++	match "product" "(0x0148|0x0150|0x012e|0x00e8|0x016f|0x015d)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MOTOROLA4";
-+	match "product" "($USB_PRODUCT_MOTOROLA4_RT2770|$USB_PRODUCT_MOTOROLA4_RT3070)";
++	match "vendor" "0x100d";
++	match "product" "(0x9031|0x9032)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MSI";
-+	match "product" "($USB_PRODUCT_MSI_RT3070_1|$USB_PRODUCT_MSI_RT3070_2|$USB_PRODUCT_MSI_RT3070_3|$USB_PRODUCT_MSI_RT3070_4|$USB_PRODUCT_MSI_RT3070_5|$USB_PRODUCT_MSI_RT3070_6|$USB_PRODUCT_MSI_RT3070_7|$USB_PRODUCT_MSI_RT3070_8|$USB_PRODUCT_MSI_RT3070_9|$USB_PRODUCT_MSI_RT3070_10|$USB_PRODUCT_MSI_RT3070_11)";
++	match "vendor" "0x0db0";
++	match "product" "(0x3820|0x3821|0x3870|0x6899|0x821a|0x870a|0x899a|0x3822|0x3871|0x822a|0x871a)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_OVISLINK";
-+	match "product" "$USB_PRODUCT_OVISLINK_RT3072";
++	match "vendor" "0x1b75";
++	match "product" "0x3072";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PARA";
-+	match "product" "$USB_PRODUCT_PARA_RT3070";
++	match "vendor" "0x20b8";
++	match "product" "0x8888";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PEGATRON";
-+	match "product" "($USB_PRODUCT_PEGATRON_RT2870|$USB_PRODUCT_PEGATRON_RT3070|$USB_PRODUCT_PEGATRON_RT3070_2|$USB_PRODUCT_PEGATRON_RT3070_3)";
++	match "vendor" "0x1d4d";
++	match "product" "(0x0002|0x000c|0x000e|0x0010)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PHILIPS";
-+	match "product" "$USB_PRODUCT_PHILIPS_RT2870";
++	match "vendor" "0x0471";
++	match "product" "0x200f";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PLANEX2";
-+	match "product" "($USB_PRODUCT_PLANEX2_GWUS300MINIS|$USB_PRODUCT_PLANEX2_GWUSMICRON|$USB_PRODUCT_PLANEX2_RT2870|$USB_PRODUCT_PLANEX2_RT3070)";
++	match "vendor" "0x2019";
++	match "product" "(0xab24|0xed14|0xed06|0xab25)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_QCOM";
-+	match "product" "$USB_PRODUCT_QCOM_RT2870";
++	match "vendor" "0x18e8";
++	match "product" "0x6259";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_QUANTA";
-+	match "product" "$USB_PRODUCT_QUANTA_RT3070";
++	match "vendor" "0x0408";
++	match "product" "0x0304";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_RALINK";
-+	match "product" "($USB_PRODUCT_RALINK_RT2070|$USB_PRODUCT_RALINK_RT2770|$USB_PRODUCT_RALINK_RT2870|$USB_PRODUCT_RALINK_RT3070|$USB_PRODUCT_RALINK_RT3071|$USB_PRODUCT_RALINK_RT3072|$USB_PRODUCT_RALINK_RT3370|$USB_PRODUCT_RALINK_RT3572|$USB_PRODUCT_RALINK_RT8070)";
++	match "vendor" "0x148f";
++	match "product" "(0x2070|0x2770|0x2870|0x3070|0x3071|0x3072|0x3370|0x3572|0x8070)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SAMSUNG2";
-+	match "product" "$USB_PRODUCT_SAMSUNG2_RT2870_1";
++	match "vendor" "0x055d";
++	match "product" "0x2018";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SENAO";
-+	match "product" "($USB_PRODUCT_SENAO_RT2870_1|$USB_PRODUCT_SENAO_RT2870_2|$USB_PRODUCT_SENAO_RT2870_3|$USB_PRODUCT_SENAO_RT2870_4|$USB_PRODUCT_SENAO_RT3070|$USB_PRODUCT_SENAO_RT3071|$USB_PRODUCT_SENAO_RT3072_1|$USB_PRODUCT_SENAO_RT3072_2|$USB_PRODUCT_SENAO_RT3072_3|$USB_PRODUCT_SENAO_RT3072_4|$USB_PRODUCT_SENAO_RT3072_5)";
++	match "vendor" "0x1740";
++	match "product" "(0x9701|0x9702|0x0605|0x0615|0x9703|0x9705|0x9706|0x9707|0x9708|0x9709|0x9801)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SITECOMEU";
-+	match "product" "($USB_PRODUCT_SITECOMEU_RT2770|$USB_PRODUCT_SITECOMEU_RT2870_1|$USB_PRODUCT_SITECOMEU_RT2870_2|$USB_PRODUCT_SITECOMEU_RT2870_3|$USB_PRODUCT_SITECOMEU_RT2870_4|$USB_PRODUCT_SITECOMEU_RT3070|$USB_PRODUCT_SITECOMEU_RT3070_2|$USB_PRODUCT_SITECOMEU_RT3070_3|$USB_PRODUCT_SITECOMEU_RT3070_4|$USB_PRODUCT_SITECOMEU_RT3071|$USB_PRODUCT_SITECOMEU_RT3072_1|$USB_PRODUCT_SITECOMEU_RT3072_2|$USB_PRODUCT_SITECOMEU_RT3072_3|$USB_PRODUCT_SITECOMEU_RT3072_4|$USB_PRODUCT_SITECOMEU_RT3072_5|$USB_PRODUCT_SITECOMEU_RT3072_6|$USB_PRODUCT_SITECOMEU_WL608)";
++	match "vendor" "0x0df6";
++	match "product" "(0x0039|0x0017|0x002b|0x002c|0x002d|0x003e|0x003b|0x003c|0x003d|0x0040|0x0041|0x0042|0x0047|0x0048|0x004a|0x004d|0x003f)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SPARKLAN";
-+	match "product" "($USB_PRODUCT_SPARKLAN_RT2870_1|$USB_PRODUCT_SPARKLAN_RT3070)";
++	match "vendor" "0x15a9";
++	match "product" "(0x0006|0x0010)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SWEEX2";
-+	match "product" "($USB_PRODUCT_SWEEX2_LW153|$USB_PRODUCT_SWEEX2_LW303|$USB_PRODUCT_SWEEX2_LW313)";
++	match "vendor" "0x177f";
++	match "product" "(0x0153|0x0302|0x0313)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TOSHIBA";
-+	match "product" "$USB_PRODUCT_TOSHIBA_RT3070";
++	match "vendor" "0x0930";
++	match "product" "0x0a07";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_UMEDIA";
-+	match "product" "$USB_PRODUCT_UMEDIA_RT2870_1";
++	match "vendor" "0x157e";
++	match "product" "0x300e";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZCOM";
-+	match "product" "($USB_PRODUCT_ZCOM_RT2870_1|$USB_PRODUCT_ZCOM_RT2870_2)";
++	match "vendor" "0x0cde";
++	match "product" "(0x0022|0x0025)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZINWELL";
-+	match "product" "($USB_PRODUCT_ZINWELL_RT2870_1|$USB_PRODUCT_ZINWELL_RT2870_2|$USB_PRODUCT_ZINWELL_RT3070|$USB_PRODUCT_ZINWELL_RT3072_1|$USB_PRODUCT_ZINWELL_RT3072_2)";
++	match "vendor" "0x5a57";
++	match "product" "(0x0280|0x0282|0x5257|0x0283|0x0284)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZYXEL";
-+	match "product" "($USB_PRODUCT_ZYXEL_RT2870_1|$USB_PRODUCT_ZYXEL_RT2870_2)";
++	match "vendor" "0x0586";
++	match "product" "(0x3416|0x341a)";
 +	action "kldload if_run";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACCTON";
-+	match "product" "($USB_PRODUCT_ACCTON_SMCWUSBG|$USB_PRODUCT_ACCTON_SMCWUSBTG2)";
++	match "vendor" "0x083a";
++	match "product" "(0x4506|0x4508)";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ATHEROS";
-+	match "product" "$USB_PRODUCT_ATHEROS_AR5523";
++	match "vendor" "0x168c";
++	match "product" "0x0001";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ATHEROS2";
-+	match "product" "($USB_PRODUCT_ATHEROS2_AR5523_1|$USB_PRODUCT_ATHEROS2_AR5523_2|$USB_PRODUCT_ATHEROS2_AR5523_3)";
++	match "vendor" "0x0cf3";
++	match "product" "(0x0001|0x0003|0x0005)";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CONCEPTRONIC";
-+	match "product" "($USB_PRODUCT_CONCEPTRONIC_AR5523_1|$USB_PRODUCT_CONCEPTRONIC_AR5523_2)";
++	match "vendor" "0x0d8e";
++	match "product" "(0x7801|0x7811)";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DLINK";
-+	match "product" "($USB_PRODUCT_DLINK_DWLAG122|$USB_PRODUCT_DLINK_DWLAG132|$USB_PRODUCT_DLINK_DWLG132)";
++	match "vendor" "0x2001";
++	match "product" "(0x3a04|0x3a00|0x3a02)";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DLINK2";
-+	match "product" "$USB_PRODUCT_DLINK2_DWA120";
++	match "vendor" "0x07d1";
++	match "product" "0x3a0c";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GIGASET";
-+	match "product" "($USB_PRODUCT_GIGASET_AR5523|$USB_PRODUCT_GIGASET_SMCWUSBTG)";
++	match "vendor" "0x1690";
++	match "product" "(0x0712|0x0710)";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GLOBALSUN";
-+	match "product" "($USB_PRODUCT_GLOBALSUN_AR5523_1|$USB_PRODUCT_GLOBALSUN_AR5523_2)";
++	match "vendor" "0x16ab";
++	match "product" "(0x7801|0x7811)";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NETGEAR";
-+	match "product" "$USB_PRODUCT_NETGEAR_WG111U";
++	match "vendor" "0x0846";
++	match "product" "0x4300";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NETGEAR3";
-+	match "product" "($USB_PRODUCT_NETGEAR3_WG111T|$USB_PRODUCT_NETGEAR3_WPN111|$USB_PRODUCT_NETGEAR3_WPN111_2)";
++	match "vendor" "0x1385";
++	match "product" "(0x4250|0x5f00|0x5f02)";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_UMEDIA";
-+	match "product" "($USB_PRODUCT_UMEDIA_TEW444UBEU|$USB_PRODUCT_UMEDIA_AR5523_2)";
++	match "vendor" "0x157e";
++	match "product" "(0x3006|0x3205)";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_WISTRONNEWEB";
-+	match "product" "($USB_PRODUCT_WISTRONNEWEB_AR5523_1|$USB_PRODUCT_WISTRONNEWEB_AR5523_2)";
++	match "vendor" "0x1435";
++	match "product" "(0x0826|0x082a)";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZCOM";
-+	match "product" "$USB_PRODUCT_ZCOM_AR5523";
++	match "vendor" "0x0cde";
++	match "product" "0x0012";
 +	action "kldload if_uath";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SHANTOU";
-+	match "product" "($USB_PRODUCT_SHANTOU_DM9601|$USB_PRODUCT_SHANTOU_ST268|$USB_PRODUCT_SHANTOU_ADM8515)";
++	match "vendor" "0x0a46";
++	match "product" "(0x9601|0x0268|0x8515)";
 +	action "kldload if_udav";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_COREGA";
-+	match "product" "$USB_PRODUCT_COREGA_FETHER_USB_TXC";
++	match "vendor" "0x07aa";
++	match "product" "0x9601";
 +	action "kldload if_udav";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_KONTRON";
-+	match "product" "($USB_PRODUCT_KONTRON_DM9601|$USB_PRODUCT_KONTRON_JP1082)";
++	match "vendor" "0x0fe6";
++	match "product" "(0x8101|0x9700)";
 +	action "kldload if_udav";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACCTON";
-+	match "product" "$USB_PRODUCT_ACCTON_PRISM_GT";
++	match "vendor" "0x083a";
++	match "product" "0x4521";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "$USB_PRODUCT_BELKIN_F5D7050";
++	match "vendor" "0x050d";
++	match "product" "0x7050";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CISCOLINKSYS";
-+	match "product" "$USB_PRODUCT_CISCOLINKSYS_WUSB54AG";
++	match "vendor" "0x13b1";
++	match "product" "0x000c";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CONCEPTRONIC";
-+	match "product" "$USB_PRODUCT_CONCEPTRONIC_PRISM_GT";
++	match "vendor" "0x0d8e";
++	match "product" "0x3762";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DELL";
-+	match "product" "($USB_PRODUCT_DELL_PRISM_GT_1|$USB_PRODUCT_DELL_PRISM_GT_2)";
++	match "vendor" "0x413c";
++	match "product" "(0x8102|0x8104)";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_FSC";
-+	match "product" "$USB_PRODUCT_FSC_E5400";
++	match "vendor" "0x0bf8";
++	match "product" "0x1009";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GLOBESPAN";
-+	match "product" "($USB_PRODUCT_GLOBESPAN_PRISM_GT_1|$USB_PRODUCT_GLOBESPAN_PRISM_GT_2)";
++	match "vendor" "0x0915";
++	match "product" "(0x2000|0x2002)";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NETGEAR";
-+	match "product" "$USB_PRODUCT_NETGEAR_WG111V2_2";
++	match "vendor" "0x0846";
++	match "product" "0x4240";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_INTERSIL";
-+	match "product" "$USB_PRODUCT_INTERSIL_PRISM_GT";
++	match "vendor" "0x09aa";
++	match "product" "0x1000";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SMC";
-+	match "product" "$USB_PRODUCT_SMC_2862WG";
++	match "vendor" "0x0707";
++	match "product" "0xee13";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_USR";
-+	match "product" "$USB_PRODUCT_USR_USR5422";
++	match "vendor" "0x0baf";
++	match "product" "0x0118";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_WISTRONNEWEB";
-+	match "product" "$USB_PRODUCT_WISTRONNEWEB_UR045G";
++	match "vendor" "0x1435";
++	match "product" "0x0427";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_XYRATEX";
-+	match "product" "($USB_PRODUCT_XYRATEX_PRISM_GT_1|$USB_PRODUCT_XYRATEX_PRISM_GT_2)";
++	match "vendor" "0x0567";
++	match "product" "(0x2000|0x2002)";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZCOM";
-+	match "product" "($USB_PRODUCT_ZCOM_XG703A|$USB_PRODUCT_ZCOM_XM142)";
++	match "vendor" "0x0cde";
++	match "product" "(0x0008|0x0015)";
 +	action "kldload if_upgt";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASUS";
-+	match "product" "($USB_PRODUCT_ASUS_WL167G|$USB_PRODUCT_ASUS_RT2570)";
++	match "vendor" "0x0b05";
++	match "product" "(0x1707|0x1706)";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "($USB_PRODUCT_BELKIN_F5D7050|$USB_PRODUCT_BELKIN_F5D7051)";
++	match "vendor" "0x050d";
++	match "product" "(0x7050|0x7051)";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CISCOLINKSYS";
-+	match "product" "($USB_PRODUCT_CISCOLINKSYS_HU200TS|$USB_PRODUCT_CISCOLINKSYS_WUSB54G|$USB_PRODUCT_CISCOLINKSYS_WUSB54GP)";
++	match "vendor" "0x13b1";
++	match "product" "(0x001a|0x000d|0x0011)";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CONCEPTRONIC2";
-+	match "product" "$USB_PRODUCT_CONCEPTRONIC2_C54RU";
++	match "vendor" "0x14b2";
++	match "product" "0x3c02";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DLINK";
-+	match "product" "$USB_PRODUCT_DLINK_DWLG122";
++	match "vendor" "0x2001";
++	match "product" "0x3c00";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GIGABYTE";
-+	match "product" "($USB_PRODUCT_GIGABYTE_GN54G|$USB_PRODUCT_GIGABYTE_GNWBKG)";
++	match "vendor" "0x1044";
++	match "product" "(0x8001|0x8007)";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GUILLEMOT";
-+	match "product" "$USB_PRODUCT_GUILLEMOT_HWGUSB254";
++	match "vendor" "0x06f8";
++	match "product" "0xe000";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MELCO";
-+	match "product" "($USB_PRODUCT_MELCO_KG54|$USB_PRODUCT_MELCO_KG54AI|$USB_PRODUCT_MELCO_KG54YB|$USB_PRODUCT_MELCO_NINWIFI)";
++	match "vendor" "0x0411";
++	match "product" "(0x0066|0x0067|0x005e|0x008b)";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MSI";
-+	match "product" "($USB_PRODUCT_MSI_RT2570|$USB_PRODUCT_MSI_RT2570_2|$USB_PRODUCT_MSI_RT2570_3)";
++	match "vendor" "0x0db0";
++	match "product" "(0x6861|0x6865|0x6869)";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NOVATECH";
-+	match "product" "$USB_PRODUCT_NOVATECH_NV902";
++	match "vendor" "0x0eb0";
++	match "product" "0x9020";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_RALINK";
-+	match "product" "($USB_PRODUCT_RALINK_RT2570|$USB_PRODUCT_RALINK_RT2570_2|$USB_PRODUCT_RALINK_RT2570_3)";
++	match "vendor" "0x148f";
++	match "product" "(0x1706|0x2570|0x9020)";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SIEMENS2";
-+	match "product" "$USB_PRODUCT_SIEMENS2_WL54G";
++	match "vendor" "0x0681";
++	match "product" "0x3c06";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SMC";
-+	match "product" "$USB_PRODUCT_SMC_2862WG";
++	match "vendor" "0x0707";
++	match "product" "0xee13";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SPHAIRON";
-+	match "product" "$USB_PRODUCT_SPHAIRON_UB801R";
++	match "vendor" "0x114b";
++	match "product" "0x0110";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SURECOM";
-+	match "product" "$USB_PRODUCT_SURECOM_RT2570";
++	match "vendor" "0x0769";
++	match "product" "0x11f3";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_VTECH";
-+	match "product" "$USB_PRODUCT_VTECH_RT2570";
++	match "vendor" "0x0f88";
++	match "product" "0x3012";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZINWELL";
-+	match "product" "$USB_PRODUCT_ZINWELL_RT2570";
++	match "vendor" "0x5a57";
++	match "product" "0x0260";
 +	action "kldload if_ural";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NETGEAR";
-+	match "product" "($USB_PRODUCT_NETGEAR_WG111V3|$USB_PRODUCT_NETGEAR_WG111V2|0x6100)";
++	match "vendor" "0x0846";
++	match "product" "(0x4260|0x6a00|0x6100)";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_REALTEK";
-+	match "product" "($USB_PRODUCT_REALTEK_RTL8187B_0|$USB_PRODUCT_REALTEK_RTL8187B_1|$USB_PRODUCT_REALTEK_RTL8187B_2|$USB_PRODUCT_REALTEK_RTL8187)";
++	match "vendor" "0x0bda";
++	match "product" "(0x8189|0x8197|0x8198|0x8187)";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SITECOMEU";
-+	match "product" "($USB_PRODUCT_SITECOMEU_WL168V4|$USB_PRODUCT_SITECOMEU_WL168V1)";
++	match "vendor" "0x0df6";
++	match "product" "(0x0028|0x000d)";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASUS";
-+	match "product" "$USB_PRODUCT_ASUS_P5B_WIFI";
++	match "vendor" "0x0b05";
++	match "product" "0x171d";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "$USB_PRODUCT_BELKIN_F5D7050E";
++	match "vendor" "0x050d";
++	match "product" "0x705e";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_LINKSYS4";
-+	match "product" "$USB_PRODUCT_LINKSYS4_WUSB54GCV2";
++	match "vendor" "0x1737";
++	match "product" "0x0073";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SURECOM";
-+	match "product" "$USB_PRODUCT_SURECOM_EP9001G2A";
++	match "vendor" "0x0769";
++	match "product" "0x11f2";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_OVISLINK";
++	match "vendor" "0x1b75";
 +	match "product" "0x8187";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DICKSMITH";
++	match "vendor" "0x1371";
 +	match "product" "0x9401";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HP";
++	match "vendor" "0x03f0";
 +	match "product" "0xca02";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_LOGITEC";
++	match "vendor" "0x0789";
 +	match "product" "0x010c";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SPHAIRON";
++	match "vendor" "0x114b";
 +	match "product" "0x0150";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_QCOM";
++	match "vendor" "0x18e8";
 +	match "product" "0x6232";
 +	action "kldload if_urtw";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_3COM2";
-+	match "product" "$USB_PRODUCT_3COM2_3CRUSB10075";
++	match "vendor" "0x6891";
++	match "product" "0xa727";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ABOCOM";
-+	match "product" "$USB_PRODUCT_ABOCOM_WL54";
++	match "vendor" "0x07b8";
++	match "product" "0x6001";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASUS";
-+	match "product" "$USB_PRODUCT_ASUS_WL159G";
++	match "vendor" "0x0b05";
++	match "product" "0x170c";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CYBERTAN";
-+	match "product" "$USB_PRODUCT_CYBERTAN_TG54USB";
++	match "vendor" "0x129b";
++	match "product" "0x1666";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DRAYTEK";
-+	match "product" "$USB_PRODUCT_DRAYTEK_VIGOR550";
++	match "vendor" "0x0675";
++	match "product" "0x0550";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PLANEX2";
-+	match "product" "($USB_PRODUCT_PLANEX2_GWUS54GD|$USB_PRODUCT_PLANEX2_GWUS54GZL)";
++	match "vendor" "0x2019";
++	match "product" "(0xed01|0xc007)";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PLANEX3";
-+	match "product" "($USB_PRODUCT_PLANEX3_GWUS54GZ|$USB_PRODUCT_PLANEX3_GWUS54MINI)";
++	match "vendor" "0x14ea";
++	match "product" "(0xab10|0xab13)";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SAGEM";
-+	match "product" "$USB_PRODUCT_SAGEM_XG760A";
++	match "vendor" "0x079b";
++	match "product" "0x004a";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SENAO";
-+	match "product" "$USB_PRODUCT_SENAO_NUB8301";
++	match "vendor" "0x1740";
++	match "product" "0x2000";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SITECOMEU";
-+	match "product" "$USB_PRODUCT_SITECOMEU_WL113";
++	match "vendor" "0x0df6";
++	match "product" "0x9071";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SWEEX";
-+	match "product" "$USB_PRODUCT_SWEEX_ZD1211";
++	match "vendor" "0x5173";
++	match "product" "0x1809";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TEKRAM";
-+	match "product" "($USB_PRODUCT_TEKRAM_QUICKWLAN|$USB_PRODUCT_TEKRAM_ZD1211_1|$USB_PRODUCT_TEKRAM_ZD1211_2)";
++	match "vendor" "0x0b3b";
++	match "product" "(0x1630|0x5630|0x6630)";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TWINMOS";
-+	match "product" "$USB_PRODUCT_TWINMOS_G240";
++	match "vendor" "0x126f";
++	match "product" "0xa006";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_UMEDIA";
-+	match "product" "($USB_PRODUCT_UMEDIA_ALL0298V2|$USB_PRODUCT_UMEDIA_TEW429UB_A|$USB_PRODUCT_UMEDIA_TEW429UB)";
++	match "vendor" "0x157e";
++	match "product" "(0x3204|0x300a|0x300b)";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_WISTRONNEWEB";
-+	match "product" "$USB_PRODUCT_WISTRONNEWEB_UR055G";
++	match "vendor" "0x1435";
++	match "product" "0x0711";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZCOM";
-+	match "product" "$USB_PRODUCT_ZCOM_ZD1211";
++	match "vendor" "0x0cde";
++	match "product" "0x0011";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZYDAS";
-+	match "product" "$USB_PRODUCT_ZYDAS_ZD1211";
++	match "vendor" "0x0ace";
++	match "product" "0x1211";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZYXEL";
-+	match "product" "($USB_PRODUCT_ZYXEL_AG225H|$USB_PRODUCT_ZYXEL_ZYAIRG220|$USB_PRODUCT_ZYXEL_G200V2)";
++	match "vendor" "0x0586";
++	match "product" "(0x3409|0x3401|0x3407)";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACCTON";
-+	match "product" "($USB_PRODUCT_ACCTON_SMCWUSBG_NF|$USB_PRODUCT_ACCTON_SMCWUSBG|$USB_PRODUCT_ACCTON_ZD1211B)";
++	match "vendor" "0x083a";
++	match "product" "(0x4505|0x4506|0xe501)";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASUS";
-+	match "product" "$USB_PRODUCT_ASUS_A9T_WIFI";
++	match "vendor" "0x0b05";
++	match "product" "0x171b";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "($USB_PRODUCT_BELKIN_F5D7050_V4000|$USB_PRODUCT_BELKIN_ZD1211B)";
++	match "vendor" "0x050d";
++	match "product" "(0x705c|0x4050)";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CISCOLINKSYS";
-+	match "product" "$USB_PRODUCT_CISCOLINKSYS_WUSBF54G";
++	match "vendor" "0x13b1";
++	match "product" "0x0024";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_FIBERLINE";
-+	match "product" "$USB_PRODUCT_FIBERLINE_WL430U";
++	match "vendor" "0x1582";
++	match "product" "0x6003";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MELCO";
-+	match "product" "$USB_PRODUCT_MELCO_KG54L";
++	match "vendor" "0x0411";
++	match "product" "0x00da";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PHILIPS";
-+	match "product" "$USB_PRODUCT_PHILIPS_SNU5600";
++	match "vendor" "0x0471";
++	match "product" "0x1236";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PLANEX2";
-+	match "product" "$USB_PRODUCT_PLANEX2_GW_US54GXS";
++	match "vendor" "0x2019";
++	match "product" "0x5303";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SAGEM";
-+	match "product" "$USB_PRODUCT_SAGEM_XG76NA";
++	match "vendor" "0x079b";
++	match "product" "0x0062";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SITECOMEU";
-+	match "product" "$USB_PRODUCT_SITECOMEU_ZD1211B";
++	match "vendor" "0x0df6";
++	match "product" "0x9075";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_UMEDIA";
-+	match "product" "$USB_PRODUCT_UMEDIA_TEW429UBC1";
++	match "vendor" "0x157e";
++	match "product" "0x300d";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_USR";
-+	match "product" "$USB_PRODUCT_USR_USR5423";
++	match "vendor" "0x0baf";
++	match "product" "0x0121";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_VTECH";
-+	match "product" "$USB_PRODUCT_VTECH_ZD1211B";
++	match "vendor" "0x0f88";
++	match "product" "0x3014";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZCOM";
-+	match "product" "$USB_PRODUCT_ZCOM_ZD1211B";
++	match "vendor" "0x0cde";
++	match "product" "0x001a";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZYDAS";
-+	match "product" "$USB_PRODUCT_ZYDAS_ZD1211B";
++	match "vendor" "0x0ace";
++	match "product" "0x1215";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ZYXEL";
-+	match "product" "($USB_PRODUCT_ZYXEL_M202|$USB_PRODUCT_ZYXEL_G202|$USB_PRODUCT_ZYXEL_G220V2)";
++	match "vendor" "0x0586";
++	match "product" "(0x340a|0x3410|0x340f)";
 +	action "kldload if_zyd";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACERP";
-+	match "product" "$USB_PRODUCT_ACERP_H10";
++	match "vendor" "0x04a5";
++	match "product" "0x4068";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AIRPLUS";
-+	match "product" "$USB_PRODUCT_AIRPLUS_MCD650";
++	match "vendor" "0x1011";
++	match "product" "0x3198";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AIRPRIME";
-+	match "product" "$USB_PRODUCT_AIRPRIME_PC5220";
++	match "vendor" "0x0f3d";
++	match "product" "0x0112";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ALINK";
-+	match "product" "($USB_PRODUCT_ALINK_3G|$USB_PRODUCT_ALINK_3GU|$USB_PRODUCT_ALINK_DWM652U5)";
++	match "vendor" "0x1e0e";
++	match "product" "(0x9000|0x9200|0xce16)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AMOI";
-+	match "product" "($USB_PRODUCT_AMOI_H01|$USB_PRODUCT_AMOI_H01A|$USB_PRODUCT_AMOI_H02)";
++	match "vendor" "0x1614";
++	match "product" "(0x0800|0x7002|0x0802)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ANYDATA";
-+	match "product" "($USB_PRODUCT_ANYDATA_ADU_500A|$USB_PRODUCT_ANYDATA_ADU_620UW|$USB_PRODUCT_ANYDATA_ADU_E100X)";
++	match "vendor" "0x16d5";
++	match "product" "(0x6502|0x6202|0x6501)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AXESSTEL";
-+	match "product" "$USB_PRODUCT_AXESSTEL_DATAMODEM";
++	match "vendor" "0x1726";
++	match "product" "0x1000";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CMOTECH";
-+	match "product" "$USB_PRODUCT_CMOTECH_CDMA_MODEM1";
++	match "vendor" "0x16d8";
++	match "product" "0x6280";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DELL";
-+	match "product" "($USB_PRODUCT_DELL_U5500|$USB_PRODUCT_DELL_U5505|$USB_PRODUCT_DELL_U5510|$USB_PRODUCT_DELL_U5520|$USB_PRODUCT_DELL_U5520_2|$USB_PRODUCT_DELL_U5520_3|$USB_PRODUCT_DELL_U5700|$USB_PRODUCT_DELL_U5700_2|$USB_PRODUCT_DELL_U5700_3|$USB_PRODUCT_DELL_U5700_4|$USB_PRODUCT_DELL_U5720|$USB_PRODUCT_DELL_U5720_2|$USB_PRODUCT_DELL_U5730|$USB_PRODUCT_DELL_U5730_2|$USB_PRODUCT_DELL_U5730_3|$USB_PRODUCT_DELL_U740)";
++	match "vendor" "0x413c";
++	match "product" "(0x8115|0x8116|0x8118|0x8136|0x8137|0x8138|0x8114|0x8117|0x8128|0x8129|0x8133|0x8134|0x8180|0x8181|0x8182|0x8135)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DLINK3";
-+	match "product" "$USB_PRODUCT_DLINK3_DWM652";
++	match "vendor" "0x1186";
++	match "product" "0x3e04";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HP";
-+	match "product" "($USB_PRODUCT_HP_EV2200|$USB_PRODUCT_HP_HS2300)";
++	match "vendor" "0x03f0";
++	match "product" "(0x1b1d|0x1e1d)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_KYOCERA2";
-+	match "product" "($USB_PRODUCT_KYOCERA2_CDMA_MSM_K|$USB_PRODUCT_KYOCERA2_KPC680)";
++	match "vendor" "0x0c88";
++	match "product" "(0x17da|0x180a)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_LONGCHEER";
-+	match "product" "$USB_PRODUCT_LONGCHEER_W14";
++	match "vendor" "0x1c9e";
++	match "product" "0x9603";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MERLIN";
-+	match "product" "$USB_PRODUCT_MERLIN_V620";
++	match "vendor" "0x1416";
++	match "product" "0x1110";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NEOTEL";
-+	match "product" "$USB_PRODUCT_NEOTEL_PRIME";
++	match "vendor" "0x1d09";
++	match "product" "0x4000";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NOVATEL";
-+	match "product" "($USB_PRODUCT_NOVATEL_E725|$USB_PRODUCT_NOVATEL_ES620|$USB_PRODUCT_NOVATEL_ES620_2|$USB_PRODUCT_NOVATEL_EU730|$USB_PRODUCT_NOVATEL_EU740|$USB_PRODUCT_NOVATEL_EU870D|$USB_PRODUCT_NOVATEL_MC760|$USB_PRODUCT_NOVATEL_MC547|$USB_PRODUCT_NOVATEL_MC950D|$USB_PRODUCT_NOVATEL_U720|$USB_PRODUCT_NOVATEL_U727|$USB_PRODUCT_NOVATEL_U727_2|$USB_PRODUCT_NOVATEL_U740|$USB_PRODUCT_NOVATEL_U740_2|$USB_PRODUCT_NOVATEL_U870|$USB_PRODUCT_NOVATEL_V620|$USB_PRODUCT_NOVATEL_V640|$USB_PRODUCT_NOVATEL_V720|$USB_PRODUCT_NOVATEL_V740|$USB_PRODUCT_NOVATEL_X950D|$USB_PRODUCT_NOVATEL_XU870)";
++	match "vendor" "0x1410";
++	match "product" "(0x2120|0x2100|0x2130|0x2400|0x2410|0x2420|0x6002|0x7042|0x4400|0x2110|0x4100|0x5100|0x1400|0x1410|0x1420|0x1110|0x1100|0x1130|0x1120|0x1450|0x1430)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_OPTION";
-+	match "product" "($USB_PRODUCT_OPTION_E6500|$USB_PRODUCT_OPTION_E6501|$USB_PRODUCT_OPTION_E6601|$USB_PRODUCT_OPTION_E6721|$USB_PRODUCT_OPTION_E6741|$USB_PRODUCT_OPTION_E6761|$USB_PRODUCT_OPTION_E6800|$USB_PRODUCT_OPTION_E7021|$USB_PRODUCT_OPTION_E7041|$USB_PRODUCT_OPTION_E7061|$USB_PRODUCT_OPTION_E7100|$USB_PRODUCT_OPTION_GE40X|$USB_PRODUCT_OPTION_GT3G|$USB_PRODUCT_OPTION_GT3GPLUS|$USB_PRODUCT_OPTION_GT3GQUAD|$USB_PRODUCT_OPTION_GT3G_1|$USB_PRODUCT_OPTION_GT3G_2|$USB_PRODUCT_OPTION_GT3G_3|$USB_PRODUCT_OPTION_GT3G_4|$USB_PRODUCT_OPTION_GT3G_5|$USB_PRODUCT_OPTION_GT3G_6|$USB_PRODUCT_OPTION_GTHSDPA|$USB_PRODUCT_OPTION_GTM380|$USB_PRODUCT_OPTION_GTMAX36|$USB_PRODUCT_OPTION_GTMAX380HSUPAE|$USB_PRODUCT_OPTION_GTMAXHSUPA|$USB_PRODUCT_OPTION_GTMAXHSUPAE|$USB_PRODUCT_OPTION_VODAFONEMC3G)";
++	match "vendor" "0x0af0";
++	match "product" "(0x6500|0x6501|0x6601|0x6721|0x6741|0x6761|0x6800|0x7021|0x7041|0x7061|0x7100|0x7601|0x6000|0x6600|0x6300|0x6050|0x6100|0x6150|0x6200|0x6250|0x6350|0x6971|0x7201|0x6701|0x7211|0x7001|0x6901|0x5000)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_QISDA";
-+	match "product" "($USB_PRODUCT_QISDA_H20_1|$USB_PRODUCT_QISDA_H20_2|$USB_PRODUCT_QISDA_H21_1|$USB_PRODUCT_QISDA_H21_2)";
++	match "vendor" "0x1da5";
++	match "product" "(0x4515|0x4519|0x4512|0x4523)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_QUALCOMM2";
-+	match "product" "($USB_PRODUCT_QUALCOMM2_AC8700|$USB_PRODUCT_QUALCOMM2_MF330)";
++	match "vendor" "0x05c6";
++	match "product" "(0x6000|0x6613)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_QUALCOMMINC";
-+	match "product" "($USB_PRODUCT_QUALCOMMINC_AC2726|$USB_PRODUCT_QUALCOMMINC_AC8700|$USB_PRODUCT_QUALCOMMINC_AC8710|$USB_PRODUCT_QUALCOMMINC_E0002|$USB_PRODUCT_QUALCOMMINC_E0003|$USB_PRODUCT_QUALCOMMINC_E0004|$USB_PRODUCT_QUALCOMMINC_E0005|$USB_PRODUCT_QUALCOMMINC_E0006|$USB_PRODUCT_QUALCOMMINC_E0007|$USB_PRODUCT_QUALCOMMINC_E0008|$USB_PRODUCT_QUALCOMMINC_E0009|$USB_PRODUCT_QUALCOMMINC_E000A|$USB_PRODUCT_QUALCOMMINC_E000B|$USB_PRODUCT_QUALCOMMINC_E000C|$USB_PRODUCT_QUALCOMMINC_E000D|$USB_PRODUCT_QUALCOMMINC_E000E|$USB_PRODUCT_QUALCOMMINC_E000F|$USB_PRODUCT_QUALCOMMINC_E0010|$USB_PRODUCT_QUALCOMMINC_E0011|$USB_PRODUCT_QUALCOMMINC_E0012|$USB_PRODUCT_QUALCOMMINC_E0013|$USB_PRODUCT_QUALCOMMINC_E0014|$USB_PRODUCT_QUALCOMMINC_E0017|$USB_PRODUCT_QUALCOMMINC_E0018|$USB_PRODUCT_QUALCOMMINC_E0019|$USB_PRODUCT_QUALCOMMINC_E0020|$USB_PRODUCT_QUALCOMMINC_E0021|$USB_PRODUCT_QUALCOMMINC_E0022|$USB_PRODUCT_QUALCOMMINC_E0023|$USB_PRODUCT_QUALCOMMINC_E0024|$USB_PRODUCT_QUALCOMMINC_E0025|$USB_PRODUCT_QUALCOMMINC_E0026|$USB_PRODUCT_QUALCOMMINC_E0027|$USB_PRODUCT_QUALCOMMINC_E0028|$USB_PRODUCT_QUALCOMMINC_E0029|$USB_PRODUCT_QUALCOMMINC_E0030|$USB_PRODUCT_QUALCOMMINC_E0032|$USB_PRODUCT_QUALCOMMINC_E0033|$USB_PRODUCT_QUALCOMMINC_E0037|$USB_PRODUCT_QUALCOMMINC_E0039|$USB_PRODUCT_QUALCOMMINC_E0042|$USB_PRODUCT_QUALCOMMINC_E0043|$USB_PRODUCT_QUALCOMMINC_E0048|$USB_PRODUCT_QUALCOMMINC_E0049|$USB_PRODUCT_QUALCOMMINC_E0051|$USB_PRODUCT_QUALCOMMINC_E0052|$USB_PRODUCT_QUALCOMMINC_E0054|$USB_PRODUCT_QUALCOMMINC_E0055|$USB_PRODUCT_QUALCOMMINC_E0057|$USB_PRODUCT_QUALCOMMINC_E0058|$USB_PRODUCT_QUALCOMMINC_E0059|$USB_PRODUCT_QUALCOMMINC_E0060|$USB_PRODUCT_QUALCOMMINC_E0061|$USB_PRODUCT_QUALCOMMINC_E0062|$USB_PRODUCT_QUALCOMMINC_E0063|$USB_PRODUCT_QUALCOMMINC_E0064|$USB_PRODUCT_QUALCOMMINC_E0066|$USB_PRODUCT_QUALCOMMINC_E0069|$USB_PRODUCT_QUALCOMMINC_E0070|$USB_PRODUCT_QUALCOMMINC_E0073|$USB_PRODUCT_QUALCOMMINC_E0076|$USB_PRODUCT_QUALCOMMINC_E0078|$USB_PRODUCT_QUALCOMMINC_E0082|$USB_PRODUCT_QUALCOMMINC_E0086|$USB_PRODUCT_QUALCOMMINC_SURFSTICK|$USB_PRODUCT_QUALCOMMINC_E2002|$USB_PRODUCT_QUALCOMMINC_E2003|$USB_PRODUCT_QUALCOMMINC_MF626|$USB_PRODUCT_QUALCOMMINC_MF628|$USB_PRODUCT_QUALCOMMINC_MF633R)";
++	match "vendor" "0x19d2";
++	match "product" "(0xfff5|0xfffe|0xfff1|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x2002|0x2003|0x0031|0x0015|0x0016)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_QUANTA";
-+	match "product" "($USB_PRODUCT_QUANTA_GKE|$USB_PRODUCT_QUANTA_GLE|$USB_PRODUCT_QUANTA_GLX|$USB_PRODUCT_QUANTA_Q101|$USB_PRODUCT_QUANTA_Q111)";
++	match "vendor" "0x0408";
++	match "product" "(0xea05|0xea06|0xea04|0xea02|0xea03)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SIERRA";
-+	match "product" "($USB_PRODUCT_SIERRA_AC402|$USB_PRODUCT_SIERRA_AC595U|$USB_PRODUCT_SIERRA_AC597E|$USB_PRODUCT_SIERRA_AC875E|$USB_PRODUCT_SIERRA_AC875U|$USB_PRODUCT_SIERRA_AC875U_2|$USB_PRODUCT_SIERRA_AC880|$USB_PRODUCT_SIERRA_AC880E|$USB_PRODUCT_SIERRA_AC880U|$USB_PRODUCT_SIERRA_AC881|$USB_PRODUCT_SIERRA_AC881E|$USB_PRODUCT_SIERRA_AC881U|$USB_PRODUCT_SIERRA_AC885E|$USB_PRODUCT_SIERRA_AC885E_2|$USB_PRODUCT_SIERRA_AC885U|$USB_PRODUCT_SIERRA_AIRCARD580|$USB_PRODUCT_SIERRA_AIRCARD595|$USB_PRODUCT_SIERRA_AIRCARD875|$USB_PRODUCT_SIERRA_C22|$USB_PRODUCT_SIERRA_C597|$USB_PRODUCT_SIERRA_C888|$USB_PRODUCT_SIERRA_E0029|$USB_PRODUCT_SIERRA_E6892|$USB_PRODUCT_SIERRA_E6893|$USB_PRODUCT_SIERRA_EM5625|$USB_PRODUCT_SIERRA_EM5725|$USB_PRODUCT_SIERRA_MC5720|$USB_PRODUCT_SIERRA_MC5720_2|$USB_PRODUCT_SIERRA_MC5725|$USB_PRODUCT_SIERRA_MC5727|$USB_PRODUCT_SIERRA_MC5727_2|$USB_PRODUCT_SIERRA_MC5728|$USB_PRODUCT_SIERRA_MC8700|$USB_PRODUCT_SIERRA_MC8755|$USB_PRODUCT_SIERRA_MC8755_2|$USB_PRODUCT_SIERRA_MC8755_3|$USB_PRODUCT_SIERRA_MC8755_4|$USB_PRODUCT_SIERRA_MC8765|$USB_PRODUCT_SIERRA_MC8765_2|$USB_PRODUCT_SIERRA_MC8765_3|$USB_PRODUCT_SIERRA_MC8775|$USB_PRODUCT_SIERRA_MC8775_2|$USB_PRODUCT_SIERRA_MC8780|$USB_PRODUCT_SIERRA_MC8780_2|$USB_PRODUCT_SIERRA_MC8780_3|$USB_PRODUCT_SIERRA_MC8781|$USB_PRODUCT_SIERRA_MC8781_2|$USB_PRODUCT_SIERRA_MC8781_3|$USB_PRODUCT_SIERRA_MC8785|$USB_PRODUCT_SIERRA_MC8785_2|$USB_PRODUCT_SIERRA_MC8790|$USB_PRODUCT_SIERRA_MC8791|$USB_PRODUCT_SIERRA_MC8792|$USB_PRODUCT_SIERRA_MINI5725|$USB_PRODUCT_SIERRA_T11|$USB_PRODUCT_SIERRA_T598)";
++	match "vendor" "0x1199";
++	match "product" "(0x0027|0x0120|0x0021|0x6822|0x6812|0x6821|0x6850|0x6852|0x6855|0x6851|0x6853|0x6856|0x6859|0x685A|0x6880|0x0112|0x0019|0x6820|0x6891|0x0023|0x6890|0x0029|0x6892|0x6893|0x0017|0x0022|0x0218|0x0018|0x0020|0x0024|0x0224|0x0028|0x68A3|0x6804|0x6802|0x6813|0x6808|0x6803|0x6805|0x6809|0x6816|0x6815|0x6832|0x6834|0x6838|0x6833|0x6835|0x6839|0x683A|0x683B|0x683C|0x683D|0x683E|0x0220|0x0026|0x0025)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_STELERA";
-+	match "product" "$USB_PRODUCT_STELERA_C105|$USB_PRODUCT_STELERA_E1003|$USB_PRODUCT_STELERA_E1004|$USB_PRODUCT_STELERA_E1005|$USB_PRODUCT_STELERA_E1006|$USB_PRODUCT_STELERA_E1007|$USB_PRODUCT_STELERA_E1008|$USB_PRODUCT_STELERA_E1009|$USB_PRODUCT_STELERA_E100A|$USB_PRODUCT_STELERA_E100B|$USB_PRODUCT_STELERA_E100C|$USB_PRODUCT_STELERA_E100D|$USB_PRODUCT_STELERA_E100E|$USB_PRODUCT_STELERA_E100F|$USB_PRODUCT_STELERA_E1010|$USB_PRODUCT_STELERA_E1011|$USB_PRODUCT_STELERA_E1012)";
++	match "vendor" "0x1a8d";
++	match "product" "0x1002|0x1003|0x1004|0x1005|0x1006|0x1007|0x1008|0x1009|0x100a|0x100b|0x100c|0x100d|0x100e|0x100f|0x1010|0x1011|0x1012)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TCTMOBILE";
-+	match "product" "$USB_PRODUCT_TCTMOBILE_X060S";
++	match "vendor" "0x1bbb";
++	match "product" "0x0000";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TELIT";
-+	match "product" "($USB_PRODUCT_TELIT_UC864E|$USB_PRODUCT_TELIT_UC864G)";
++	match "vendor" "0x1bc7";
++	match "product" "(0x1003|0x1004)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TLAYTECH";
-+	match "product" "$USB_PRODUCT_TLAYTECH_TEU800";
++	match "vendor" "0x20b9";
++	match "product" "0x1682";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TOSHIBA";
-+	match "product" "($USB_PRODUCT_TOSHIBA_G450|$USB_PRODUCT_TOSHIBA_HSDPA)";
++	match "vendor" "0x0930";
++	match "product" "(0x0d45|0x1302)";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_YISO";
-+	match "product" "$USB_PRODUCT_YISO_C893";
++	match "vendor" "0x0eab";
++	match "product" "0xc893";
 +	action "kldload u3g";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ARKMICRO";
-+	match "product" "$USB_PRODUCT_ARKMICRO_ARK3116";
++	match "vendor" "0x6547";
++	match "product" "0x0232";
 +	action "kldload uark";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ANYDATA";
-+	match "product" "($USB_PRODUCT_ANYDATA_ADU_500A|$USB_PRODUCT_ANYDATA_ADU_E100X)";
++	match "vendor" "0x16d5";
++	match "product" "(0x6502|0x6501)";
 +	action "kldload ubsa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AXESSTEL";
-+	match "product" "$USB_PRODUCT_AXESSTEL_DATAMODEM";
++	match "vendor" "0x1726";
++	match "product" "0x1000";
 +	action "kldload ubsa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "($USB_PRODUCT_BELKIN_F5U103|$USB_PRODUCT_BELKIN_F5U120)";
++	match "vendor" "0x050d";
++	match "product" "(0x0103|0x1203)";
 +	action "kldload ubsa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ETEK";
-+	match "product" "$USB_PRODUCT_ETEK_1COM";
++	match "vendor" "0x056c";
++	match "product" "0x8007";
 +	action "kldload ubsa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GOHUBS";
-+	match "product" "$USB_PRODUCT_GOHUBS_GOCOM232";
++	match "vendor" "0x0921";
++	match "product" "0x1001";
 +	action "kldload ubsa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PERACOM";
-+	match "product" "$USB_PRODUCT_PERACOM_SERIAL1";
++	match "vendor" "0x0565";
++	match "product" "0x0001";
 +	action "kldload ubsa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_WCH";
-+	match "product" "$USB_PRODUCT_WCH_CH341SER";
++	match "vendor" "0x4348";
++	match "product" "0x5523";
 +	action "kldload uchcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_WCH2";
-+	match "product" "$USB_PRODUCT_WCH2_CH341SER";
++	match "vendor" "0x1a86";
++	match "product" "0x7523";
 +	action "kldload uchcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DELORME";
-+	match "product" "$USB_PRODUCT_DELORME_EARTHMATE";
++	match "vendor" "0x1163";
++	match "product" "0x0100";
 +	action "kldload ucycom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NETCHIP";
-+	match "product" "$USB_PRODUCT_NETCHIP_TURBOCONNECT";
++	match "vendor" "0x0525";
++	match "product" "0x1080";
 +	action "kldload udbp";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PROLIFIC";
-+	match "product" "($USB_PRODUCT_PROLIFIC_PL2301|$USB_PRODUCT_PROLIFIC_PL2302)";
++	match "vendor" "0x067b";
++	match "product" "(0x0000|0x0001)";
 +	action "kldload udbp";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ANCHOR";
-+	match "product" "$USB_PRODUCT_ANCHOR_EZLINK";
++	match "vendor" "0x0547";
++	match "product" "0x2720";
 +	action "kldload udbp";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GENESYS";
-+	match "product" "$USB_PRODUCT_GENESYS_GL620USB";
++	match "vendor" "0x05e3";
++	match "product" "0x0501";
 +	action "kldload udbp";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_EGALAX";
-+	match "product" "($USB_PRODUCT_EGALAX_TPANEL|$USB_PRODUCT_EGALAX_TPANEL2)";
++	match "vendor" "0x0eef";
++	match "product" "(0x0001|0x0002)";
 +	action "kldload uep";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_EGALAX2";
-+	match "product" "$USB_PRODUCT_EGALAX_TPANEL2";
++	match "vendor" "0x0123";
++	match "product" "0x0002";
 +	action "kldload uep";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CYPRESS";
-+	match "product" "$USB_PRODUCT_CYPRESS_FMRADIO";
++	match "vendor" "0x04b4";
++	match "product" "0x1002";
 +	action "kldload ufm";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ATMEL";
-+	match "product" "$USB_PRODUCT_ATMEL_STK541";
++	match "vendor" "0x03eb";
++	match "product" "0x2109";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DRESDENELEKTRONIK";
-+	match "product" "($USB_PRODUCT_DRESDENELEKTRONIK_SENSORTERMINALBOARD|$USB_PRODUCT_DRESDENELEKTRONIK_WIRELESSHANDHELDTERMINAL)";
++	match "vendor" "0x1cf1";
++	match "product" "(0x0001|0x0004)";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_FALCOM";
-+	match "product" "$USB_PRODUCT_FALCOM_TWIST";
++	match "vendor" "0x0f94";
++	match "product" "0x0001";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_FTDI";
-+	match "product" "($USB_PRODUCT_FTDI_GAMMASCOUT|$USB_PRODUCT_FTDI_SERIAL_8U100AX|$USB_PRODUCT_FTDI_SERIAL_2232C|$USB_PRODUCT_FTDI_SERIAL_2232D|$USB_PRODUCT_FTDI_SERIAL_4232H|$USB_PRODUCT_FTDI_SERIAL_8U232AM|$USB_PRODUCT_FTDI_SERIAL_8U232AM4|$USB_PRODUCT_FTDI_SEMC_DSS20|$USB_PRODUCT_FTDI_CFA_631|$USB_PRODUCT_FTDI_CFA_632|$USB_PRODUCT_FTDI_CFA_633|$USB_PRODUCT_FTDI_CFA_634|$USB_PRODUCT_FTDI_CFA_635|$USB_PRODUCT_FTDI_USB_UIRT|$USB_PRODUCT_FTDI_USBSERIAL|$USB_PRODUCT_FTDI_KBS|$USB_PRODUCT_FTDI_MX2_3|$USB_PRODUCT_FTDI_MX4_5|$USB_PRODUCT_FTDI_LK202|$USB_PRODUCT_FTDI_LK204|$USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13M|$USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13S|$USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13U|$USB_PRODUCT_FTDI_EISCOU|$USB_PRODUCT_FTDI_UOPTBR|$USB_PRODUCT_FTDI_EMCU2D|$USB_PRODUCT_FTDI_PCMSFU|$USB_PRODUCT_FTDI_EMCU2H|$USB_PRODUCT_FTDI_MAXSTREAM|$USB_PRODUCT_FTDI_CTI_USB_NANO_485|$USB_PRODUCT_FTDI_CTI_USB_MINI_485)";
++	match "vendor" "0x0403";
++	match "product" "(0xd678|0x8372|0x6010|0x9e90|0x6011|0x6001|0x6004|0xfc82|0xfc0c|0xfc08|0xfc0b|0xfc09|0xfc0d|0xf850|0xfa00|0xe6c8|0xfa01|0xfa02|0xfa03|0xfa04|0xcc48|0xcc49|0xcc4a|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf60b|0xf608)";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SIIG2";
-+	match "product" "$USB_PRODUCT_SIIG2_US2308";
++	match "vendor" "0x0b39";
++	match "product" "0x0421";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_INTREPIDCS";
-+	match "product" "($USB_PRODUCT_INTREPIDCS_VALUECAN|$USB_PRODUCT_INTREPIDCS_NEOVI)";
++	match "vendor" "0x093c";
++	match "product" "(0x0601|0x0701)";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BBELECTRONICS";
-+	match "product" "$USB_PRODUCT_BBELECTRONICS_USOTL4";
++	match "vendor" "0x0856";
++	match "product" "0xAC01";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MATRIXORBITAL";
-+	match "product" "$USB_PRODUCT_MATRIXORBITAL_MOUA";
++	match "vendor" "0x1b3d";
++	match "product" "0x0153";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MARVELL";
-+	match "product" "$USB_PRODUCT_MARVELL_SHEEVAPLUG";
++	match "vendor" "0x9e88";
++	match "product" "0x9e8f";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MELCO";
-+	match "product" "$USB_PRODUCT_MELCO_PCOPRS1";
++	match "vendor" "0x0411";
++	match "product" "0x00b3";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_RATOC";
-+	match "product" "$USB_PRODUCT_RATOC_REXUSB60F";
++	match "vendor" "0x0584";
++	match "product" "0xb020";
 +	action "kldload uftdi";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_AIRPRIME";
-+	match "product" "$USB_PRODUCT_AIRPRIME_PC5220";
++	match "vendor" "0x0f3d";
++	match "product" "0x0112";
 +	action "kldload ugensa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CMOTECH";
-+	match "product" "$USB_PRODUCT_CMOTECH_CDMA_MODEM1";
++	match "vendor" "0x16d8";
++	match "product" "0x6280";
 +	action "kldload ugensa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_KYOCERA2";
-+	match "product" "$USB_PRODUCT_KYOCERA2_CDMA_MSM_K";
++	match "vendor" "0x0c88";
++	match "product" "0x17da";
 +	action "kldload ugensa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HP";
-+	match "product" "$USB_PRODUCT_HP_49GPLUS";
++	match "vendor" "0x03f0";
++	match "product" "0x0121";
 +	action "kldload ugensa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NOVATEL2";
-+	match "product" "$USB_PRODUCT_NOVATEL2_FLEXPACKGPS";
++	match "vendor" "0x09d7";
++	match "product" "0x0100";
 +	action "kldload ugensa";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_OPTION";
-+	match "product" "($USB_PRODUCT_OPTION_GSICON72|$USB_PRODUCT_OPTION_GTHSDPA|$USB_PRODUCT_OPTION_GSICONHSUPA|$USB_PRODUCT_OPTION_GTHSUPA|$USB_PRODUCT_OPTION_GE40X|$USB_PRODUCT_OPTION_GE40X_1|$USB_PRODUCT_OPTION_GE40X_2|$USB_PRODUCT_OPTION_GE40X_3|$USB_PRODUCT_OPTION_ICON401|$USB_PRODUCT_OPTION_GMT382|$USB_PRODUCT_OPTION_ICONEDGE|$USB_PRODUCT_OPTION_MODHSXPA|$USB_PRODUCT_OPTION_ICON321|$USB_PRODUCT_OPTION_GTICON322|$USB_PRODUCT_OPTION_ICON505|$USB_PRODUCT_OPTION_ICON505)";
++	match "vendor" "0x0af0";
++	match "product" "(0x6911|0x6971|0x7251|0x7011|0x7601|0x7301|0x7361|0x7381|0x7401|0x7501|0xc031|0xd013|0xd031|0xd033|0xd055|0xd055)";
 +	action "kldload uhso";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ASUS";
-+	match "product" "$USB_PRODUCT_ASUS_P535";
++	match "vendor" "0x0b05";
++	match "product" "0x420f";
 +	action "kldload uipaq";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CASIO";
-+	match "product" "$USB_PRODUCT_CASIO_BE300";
++	match "vendor" "0x07cf";
++	match "product" "0x2002";
 +	action "kldload uipaq";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_COMPAQ";
-+	match "product" "$USB_PRODUCT_COMPAQ_IPAQPOCKETPC";
++	match "vendor" "0x049f";
++	match "product" "0x0003";
 +	action "kldload uipaq";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HP";
-+	match "product" "($USB_PRODUCT_HP_2215|$USB_PRODUCT_HP_568J)";
++	match "vendor" "0x03f0";
++	match "product" "(0x1016|0x1116)";
 +	action "kldload uipaq";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HTC";
-+	match "product" "($USB_PRODUCT_HTC_PPC6700MODEM|$USB_PRODUCT_HTC_SMARTPHONE|$USB_PRODUCT_HTC_WINMOBILE|$USB_PRODUCT_HTC_WIZARD)";
++	match "vendor" "0x0bb4";
++	match "product" "(0x00cf|0x0a51|0x00ce|0x0bce)";
 +	action "kldload uipaq";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SHARP";
-+	match "product" "($USB_PRODUCT_SHARP_WZERO3ES|$USB_PRODUCT_SHARP_WZERO3ADES|$USB_PRODUCT_SHARP_WILLCOM03)";
++	match "vendor" "0x04dd";
++	match "product" "(0x9123|0x91ac|0x9242)";
 +	action "kldload uipaq";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TOSHIBA";
-+	match "product" "$USB_PRODUCT_TOSHIBA_POCKETPC_E740";
++	match "vendor" "0x0930";
++	match "product" "0x0706";
 +	action "kldload uipaq";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MOSCHIP";
-+	match "product" "($USB_PRODUCT_MOSCHIP_MCS7820|$USB_PRODUCT_MOSCHIP_MCS7840)";
++	match "vendor" "0x9710";
++	match "product" "(0x7820|0x7840)";
 +	action "kldload umcs";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MCT";
-+	match "product" "($USB_PRODUCT_MCT_USB232|$USB_PRODUCT_MCT_SITECOM_USB232|$USB_PRODUCT_MCT_DU_H3SP_USB232)";
++	match "vendor" "0x0711";
++	match "product" "(0x0210|0x0230|0x0200)";
 +	action "kldload umct";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "($USB_PRODUCT_BELKIN_F5U109|$USB_PRODUCT_BELKIN_F5U409)";
++	match "vendor" "0x050d";
++	match "product" "(0x0109|0x0409)";
 +	action "kldload umct";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_KYOCERA";
-+	match "product" "$USB_PRODUCT_KYOCERA_AHK3001V";
++	match "vendor" "0x0482";
++	match "product" "0x0203";
 +	action "kldload umodem";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SIERRA";
-+	match "product" "$USB_PRODUCT_SIERRA_MC5720";
++	match "vendor" "0x1199";
++	match "product" "0x0218";
 +	action "kldload umodem";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CURITEL";
-+	match "product" "$USB_PRODUCT_CURITEL_PC5740";
++	match "vendor" "0x106c";
++	match "product" "0x3701";
 +	action "kldload umodem";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MOSCHIP";
-+	match "product" "$USB_PRODUCT_MOSCHIP_MCS7703";
++	match "vendor" "0x9710";
++	match "product" "0x7703";
 +	action "kldload umoscom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACERP";
-+	match "product" "$USB_PRODUCT_ACERP_S81";
++	match "vendor" "0x04a5";
++	match "product" "0x4027";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ADLINK";
-+	match "product" "$USB_PRODUCT_ADLINK_ND6530";
++	match "vendor" "0x0b63";
++	match "product" "0x6530";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ALCATEL";
-+	match "product" "$USB_PRODUCT_ALCATEL_OT535";
++	match "vendor" "0x11f7";
++	match "product" "0x02df";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ALCOR";
-+	match "product" "$USB_PRODUCT_ALCOR_AU9720";
++	match "vendor" "0x058f";
++	match "product" "0x9720";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ANCHOR";
-+	match "product" "$USB_PRODUCT_ANCHOR_SERIAL";
++	match "vendor" "0x0547";
++	match "product" "0x2008";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ATEN";
-+	match "product" "$USB_PRODUCT_ATEN_UC232A";
++	match "vendor" "0x0557";
++	match "product" "0x2008";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BELKIN";
-+	match "product" "$USB_PRODUCT_BELKIN_F5U257";
++	match "vendor" "0x050d";
++	match "product" "0x0257";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_COREGA";
-+	match "product" "$USB_PRODUCT_COREGA_CGUSBRS232R";
++	match "vendor" "0x07aa";
++	match "product" "0x002a";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_EPSON";
-+	match "product" "($USB_PRODUCT_EPSON_CRESSI_EDY|$USB_PRODUCT_EPSON_N2ITION3)";
++	match "vendor" "0x04b8";
++	match "product" "(0x0521|0x0522)";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ELECOM";
-+	match "product" "($USB_PRODUCT_ELECOM_UCSGT|$USB_PRODUCT_ELECOM_UCSGT0)";
++	match "vendor" "0x056e";
++	match "product" "(0x5003|0x5004)";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HAL";
-+	match "product" "$USB_PRODUCT_HAL_IMR001";
++	match "vendor" "0x0b41";
++	match "product" "0x0011";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HP";
-+	match "product" "$USB_PRODUCT_HP_LD220";
++	match "vendor" "0x03f0";
++	match "product" "0x3524";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_IODATA";
-+	match "product" "($USB_PRODUCT_IODATA_USBRSAQ|$USB_PRODUCT_IODATA_USBRSAQ5)";
++	match "vendor" "0x04bb";
++	match "product" "(0x0a03|0x0a0e)";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ITEGNO";
-+	match "product" "($USB_PRODUCT_ITEGNO_WM1080A|$USB_PRODUCT_ITEGNO_WM2080A)";
++	match "vendor" "0x0eba";
++	match "product" "(0x1080|0x2080)";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_LEADTEK";
-+	match "product" "$USB_PRODUCT_LEADTEK_9531";
++	match "vendor" "0x0413";
++	match "product" "0x2101";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MICROSOFT";
-+	match "product" "$USB_PRODUCT_MICROSOFT_700WX";
++	match "vendor" "0x045e";
++	match "product" "0x0079";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MOBILEACTION";
-+	match "product" "$USB_PRODUCT_MOBILEACTION_MA620";
++	match "vendor" "0x0df7";
++	match "product" "0x0620";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NETINDEX";
-+	match "product" "$USB_PRODUCT_NETINDEX_WS002IN";
++	match "vendor" "0x11f6";
++	match "product" "0x2001";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_NOKIA2";
-+	match "product" "$USB_PRODUCT_NOKIA2_CA42";
++	match "vendor" "0x078b";
++	match "product" "0x1234";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_OTI";
-+	match "product" "$USB_PRODUCT_OTI_DKU5";
++	match "vendor" "0x0ea0";
++	match "product" "0x6858";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PANASONIC";
-+	match "product" "$USB_PRODUCT_PANASONIC_TYTP50P6S";
++	match "vendor" "0x04da";
++	match "product" "0x3900";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PLX";
-+	match "product" "$USB_PRODUCT_PLX_CA42";
++	match "vendor" "0x10b5";
++	match "product" "0xac70";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PROLIFIC";
-+	match "product" "($USB_PRODUCT_PROLIFIC_ALLTRONIX_GPRS|$USB_PRODUCT_PROLIFIC_ALDIGA_AL11U|$USB_PRODUCT_PROLIFIC_DCU11|$USB_PRODUCT_PROLIFIC_HCR331|$USB_PRODUCT_PROLIFIC_MICROMAX_610U|$USB_PRODUCT_PROLIFIC_PHAROS|$USB_PRODUCT_PROLIFIC_PL2303|$USB_PRODUCT_PROLIFIC_RSAQ2|$USB_PRODUCT_PROLIFIC_RSAQ3|$USB_PRODUCT_PROLIFIC_UIC_MSR206)";
++	match "vendor" "0x067b";
++	match "product" "(0x0609|0x0611|0x1234|0x331a|0x0612|0xaaa0|0x2303|0x04bb|0xaaa2|0x206a)";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PROLIFIC2";
-+	match "product" "$USB_PRODUCT_PROLIFIC2_PL2303";
++	match "vendor" "0x5372";
++	match "product" "0x2303";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_RADIOSHACK";
-+	match "product" "$USB_PRODUCT_RADIOSHACK_USBCABLE";
++	match "vendor" "0x1453";
++	match "product" "0x4026";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_RATOC";
-+	match "product" "$USB_PRODUCT_RATOC_REXUSB60";
++	match "vendor" "0x0584";
++	match "product" "0xb000";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SAGEM";
-+	match "product" "$USB_PRODUCT_SAGEM_USBSERIAL";
++	match "vendor" "0x079b";
++	match "product" "0x0027";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SAMSUNG";
-+	match "product" "$USB_PRODUCT_SAMSUNG_I330";
++	match "vendor" "0x04e8";
++	match "product" "0x8001";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SANWA";
-+	match "product" "$USB_PRODUCT_SANWA_KB_USB2";
++	match "vendor" "0x11ad";
++	match "product" "0x0701";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SIEMENS3";
-+	match "product" "($USB_PRODUCT_SIEMENS3_EF81|$USB_PRODUCT_SIEMENS3_SX1|$USB_PRODUCT_SIEMENS3_X65|$USB_PRODUCT_SIEMENS3_X75)";
++	match "vendor" "0x11f5";
++	match "product" "(0x0005|0x0001|0x0003|0x0004)";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SITECOM";
-+	match "product" "$USB_PRODUCT_SITECOM_SERIAL";
++	match "vendor" "0x6189";
++	match "product" "0x2068";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SMART";
-+	match "product" "$USB_PRODUCT_SMART_PL2303";
++	match "vendor" "0x0b8c";
++	match "product" "0x2303";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SONY";
-+	match "product" "$USB_PRODUCT_SONY_QN3";
++	match "vendor" "0x054c";
++	match "product" "0x0437";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SONYERICSSON";
-+	match "product" "($USB_PRODUCT_SONYERICSSON_DATAPILOT|$USB_PRODUCT_SONYERICSSON_DCU10)";
++	match "vendor" "0x0731";
++	match "product" "(0x2003|0x0528)";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SOURCENEXT";
-+	match "product" "($USB_PRODUCT_SOURCENEXT_KEIKAI8|$USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG)";
++	match "vendor" "0x0833";
++	match "product" "(0x039f|0x012e)";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SPEEDDRAGON";
-+	match "product" "$USB_PRODUCT_SPEEDDRAGON_MS3303H";
++	match "vendor" "0x0e55";
++	match "product" "0x110b";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SYNTECH";
-+	match "product" "$USB_PRODUCT_SYNTECH_CPT8001C";
++	match "vendor" "0x0745";
++	match "product" "0x0001";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TDK";
-+	match "product" "($USB_PRODUCT_TDK_UHA6400|$USB_PRODUCT_TDK_UPA9664)";
++	match "vendor" "0x04bf";
++	match "product" "(0x0117|0x0115)";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TRIPPLITE";
-+	match "product" "$USB_PRODUCT_TRIPPLITE_U209";
++	match "vendor" "0x2478";
++	match "product" "0x2008";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_YCCABLE";
-+	match "product" "$USB_PRODUCT_YCCABLE_PL2303";
++	match "vendor" "0x05ad";
++	match "product" "0x0fba";
 +	action "kldload uplcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DIAMOND";
-+	match "product" "$USB_PRODUCT_DIAMOND_RIO500USB";
++	match "vendor" "0x0841";
++	match "product" "0x0001";
 +	action "kldload urio";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DIAMOND2";
-+	match "product" "($USB_PRODUCT_DIAMOND2_RIO600USB|$USB_PRODUCT_DIAMOND2_RIO800USB)";
++	match "vendor" "0x045a";
++	match "product" "(0x5001|0x5002)";
 +	action "kldload urio";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_BALTECH";
-+	match "product" "$USB_PRODUCT_BALTECH_CARDREADER";
++	match "vendor" "0x13ad";
++	match "product" "0x9999";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_CLIPSAL";
-+	match "product" "$USB_PRODUCT_CLIPSAL_5500PCU";
++	match "vendor" "0x166a";
++	match "product" "0x0303";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DATAAPEX";
-+	match "product" "$USB_PRODUCT_DATAAPEX_MULTICOM";
++	match "vendor" "0xdaae";
++	match "product" "0xead6";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DELL";
-+	match "product" "$USB_PRODUCT_DELL_DW700";
++	match "vendor" "0x413c";
++	match "product" "0x9500";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DIGIANSWER";
-+	match "product" "$USB_PRODUCT_DIGIANSWER_ZIGBEE802154";
++	match "vendor" "0x08fd";
++	match "product" "0x000a";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_DYNASTREAM";
-+	match "product" "($USB_PRODUCT_DYNASTREAM_ANTDEVBOARD|$USB_PRODUCT_DYNASTREAM_ANTDEVBOARD2|$USB_PRODUCT_DYNASTREAM_ANT2USB)";
++	match "vendor" "0x0fcf";
++	match "product" "(0x1003|0x1006|0x1004)";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ELV";
-+	match "product" "$USB_PRODUCT_ELV_USBI2C";
++	match "vendor" "0x18ef";
++	match "product" "0xe00f";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_FOXCONN";
-+	match "product" "($USB_PRODUCT_FOXCONN_PIRELLI_DP_L10|$USB_PRODUCT_FOXCONN $USB_PRODUCT_FOXCONN_TCOM_TC_300)";
++	match "vendor" "0x0489";
++	match "product" "(0xe003|$USB_PRODUCT_FOXCONN 0xe000)";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GEMALTO";
-+	match "product" "$USB_PRODUCT_GEMALTO_PROXPU";
++	match "vendor" "0x08e6";
++	match "product" "0x5501";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_JABLOTRON";
-+	match "product" "$USB_PRODUCT_JABLOTRON_PC60B";
++	match "vendor" "0x16d6";
++	match "product" "0x0001";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_MEI";
-+	match "product" "($USB_PRODUCT_MEI_CASHFLOW_SC|$USB_PRODUCT_MEI $USB_PRODUCT_MEI_S2000)";
++	match "vendor" "0x0bed";
++	match "product" "(0x1100|$USB_PRODUCT_MEI 0x1101)";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_JABLOTRON";
-+	match "product" "$USB_PRODUCT_JABLOTRON_PC60B";
++	match "vendor" "0x16d6";
++	match "product" "0x0001";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_OWEN";
-+	match "product" "$USB_PRODUCT_OWEN_AC4";
++	match "vendor" "0x1555";
++	match "product" "0x0004";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PHILIPS";
-+	match "product" "$USB_PRODUCT_PHILIPS_ACE1001";
++	match "vendor" "0x0471";
++	match "product" "0x066a";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PLX";
-+	match "product" "$USB_PRODUCT_PLX_CA42";
++	match "vendor" "0x10b5";
++	match "product" "0xac70";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_RENESAS";
-+	match "product" "$USB_PRODUCT_RENESAS_RX610";
++	match "vendor" "0x045b";
++	match "product" "0x0053";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SILABS";
-+	match "product" "($USB_PRODUCT_SILABS_AEROCOMM|$USB_PRODUCT_SILABS_AMBER_AMB2560|$USB_PRODUCT_SILABS_ARGUSISP|$USB_PRODUCT_SILABS_ARKHAM_DS101_A|$USB_PRODUCT_SILABS_ARKHAM_DS101_M|$USB_PRODUCT_SILABS_ARYGON_MIFARE|$USB_PRODUCT_SILABS_AVIT_USB_TTL|$USB_PRODUCT_SILABS_B_G_H3000|$USB_PRODUCT_SILABS_BALLUFF_RFID|$USB_PRODUCT_SILABS_BEI_VCP|$USB_PRODUCT_SILABS_BSM7DUSB|$USB_PRODUCT_SILABS_BURNSIDE|$USB_PRODUCT_SILABS_C2_EDGE_MODEM|$USB_PRODUCT_SILABS_CP2102|$USB_PRODUCT_SILABS_CP210X_2|$USB_PRODUCT_SILABS_CRUMB128|$USB_PRODUCT_SILABS_CYGNAL|$USB_PRODUCT_SILABS_CYGNAL_DEBUG|$USB_PRODUCT_SILABS_CYGNAL_GPS|$USB_PRODUCT_SILABS_DEGREE|$USB_PRODUCT_SILABS_EMS_C1007|$USB_PRODUCT_SILABS_HELICOM|$USB_PRODUCT_SILABS_IMS_USB_RS422|$USB_PRODUCT_SILABS_INFINITY_MIC|$USB_PRODUCT_SILABS_INSYS_MODEM|$USB_PRODUCT_SILABS_KYOCERA_GPS|$USB_PRODUCT_SILABS_LIPOWSKY_HARP|$USB_PRODUCT_SILABS_LIPOWSKY_JTAG|$USB_PRODUCT_SILABS_LIPOWSKY_LIN|$USB_PRODUCT_SILABS_MC35PU|$USB_PRODUCT_SILABS_MJS_TOSLINK|$USB_PRODUCT_SILABS_MSD_DASHHAWK|$USB_PRODUCT_SILABS_POLOLU|$USB_PRODUCT_SILABS_PROCYON_AVS|$USB_PRODUCT_SILABS_SB_PARAMOUNT_ME|$USB_PRODUCT_SILABS_SUUNTO|$USB_PRODUCT_SILABS_TAMSMASTER|$USB_PRODUCT_SILABS_TELEGESYS_ETRX2|$USB_PRODUCT_SILABS_TRACIENT|$USB_PRODUCT_SILABS_TRAQMATE|$USB_PRODUCT_SILABS_USBCOUNT50|$USB_PRODUCT_SILABS_USBPULSE100|$USB_PRODUCT_SILABS_USBSCOPE50|$USB_PRODUCT_SILABS_USBWAVE12|$USB_PRODUCT_SILABS_VSTABI|$USB_PRODUCT_SILABS_WAVIT|$USB_PRODUCT_SILABS_WMRBATT|$USB_PRODUCT_SILABS_WMRRIGBLASTER|$USB_PRODUCT_SILABS_WMRRIGTALK|$USB_PRODUCT_SILABS_ZEPHYR_BIO)";
++	match "vendor" "0x10c4";
++	match "product" "(0x81e7|0x83a8|0x8066|0x1601|0x1101|0x8115|0x818b|0x8156|0x8477|0x846e|0x800a|0x813d|0x822b|0xea60|0xea61|0x807a|0x8382|0x8044|0x826b|0x80ca|0x81f2|0x815e|0x806f|0xea71|0x81ad|0x8411|0x8218|0x81c8|0x81e2|0x8341|0x819f|0x81ac|0x803b|0x82f9|0x8043|0x80f6|0x813f|0x8293|0x80dd|0x80ed|0xf004|0xf003|0xf001|0xf002|0x0f91|0x81a6|0x814a|0x814a|0x814b|0x81e8)";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SILABS2";
-+	match "product" "$USB_PRODUCT_SILABS2_DCU11CLONE";
++	match "vendor" "0x10a6";
++	match "product" "0xaa26";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SILABS3";
-+	match "product" "$USB_PRODUCT_SILABS3_GPRS_MODEM";
++	match "vendor" "0x10c5";
++	match "product" "0xea61";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SILABS4";
-+	match "product" "$USB_PRODUCT_SILABS4_100EU_MODEM";
++	match "vendor" "0x10ce";
++	match "product" "0xea61";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SYNTECH";
-+	match "product" "$USB_PRODUCT_SYNTECH_CYPHERLAB100";
++	match "vendor" "0x0745";
++	match "product" "0x1000";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_USI";
-+	match "product" "$USB_PRODUCT_USI_MC60";
++	match "vendor" "0x10ab";
++	match "product" "0x10c5";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_VAISALA";
-+	match "product" "$USB_PRODUCT_VAISALA_CABLE";
++	match "vendor" "0x1843";
++	match "product" "0x0200";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_WAGO";
-+	match "product" "$USB_PRODUCT_WAGO_SERVICECABLE";
++	match "vendor" "0x1be3";
++	match "product" "0x07a6";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_WAVESENSE";
-+	match "product" "$USB_PRODUCT_WAVESENSE_JAZZ";
++	match "vendor" "0x17f4";
++	match "product" "0xaaaa";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_WIENERPLEINBAUS";
-+	match "product" "($USB_PRODUCT_WIENERPLEINBAUS_PL512|$USB_PRODUCT_WIENERPLEINBAUS_RCM|$USB_PRODUCT_WIENERPLEINBAUS_MPOD|$USB_PRODUCT_WIENERPLEINBAUS_CML)";
++	match "vendor" "0x16dc";
++	match "product" "(0x0010|0x0011|0x0012|0x0015)";
 +	action "kldload uslcom";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ACEECA";
-+	match "product" "$USB_PRODUCT_ACEECA_MEZ1000";
++	match "vendor" "0x4766";
++	match "product" "0x0001";
 +	action "kldload uvisor";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_ALPHASMART";
-+	match "product" "$USB_PRODUCT_ALPHASMART_DANA_SYNC";
++	match "vendor" "0x081e";
++	match "product" "0xdf00";
 +	action "kldload uvisor";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_GARMIN";
-+	match "product" "$USB_PRODUCT_GARMIN_IQUE_3600";
++	match "vendor" "0x091e";
++	match "product" "0x0004";
 +	action "kldload uvisor";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_FOSSIL";
-+	match "product" "$USB_PRODUCT_FOSSIL_WRISTPDA";
++	match "vendor" "0x0e67";
++	match "product" "0x0002";
 +	action "kldload uvisor";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_HANDSPRING";
-+	match "product" "($USB_PRODUCT_HANDSPRING_VISOR|$USB_PRODUCT_HANDSPRING_TREO|$USB_PRODUCT_HANDSPRING_TREO600)";
++	match "vendor" "0x082d";
++	match "product" "(0x0100|0x0200|0x0300)";
 +	action "kldload uvisor";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_PALM";
-+	match "product" "($USB_PRODUCT_PALM_M500|$USB_PRODUCT_PALM_M505|$USB_PRODUCT_PALM_M515|$USB_PRODUCT_PALM_I705|$USB_PRODUCT_PALM_M125|$USB_PRODUCT_PALM_M130|$USB_PRODUCT_PALM_TUNGSTEN_Z|$USB_PRODUCT_PALM_TUNGSTEN_T|$USB_PRODUCT_PALM_ZIRE|$USB_PRODUCT_PALM_ZIRE31)";
++	match "vendor" "0x0830";
++	match "product" "(0x0001|0x0002|0x0003|0x0020|0x0040|0x0050|0x0031|0x0060|0x0070|0x0061)";
 +	action "kldload uvisor";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SAMSUNG";
-+	match "product" "$USB_PRODUCT_SAMSUNG_I500";
++	match "vendor" "0x04e8";
++	match "product" "0x6601";
 +	action "kldload uvisor";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SONY";
-+	match "product" "($USB_PRODUCT_SONY_CLIE_40|$USB_PRODUCT_SONY_CLIE_41|$USB_PRODUCT_SONY_CLIE_S360|$USB_PRODUCT_SONY_CLIE_NX60|$USB_PRODUCT_SONY_CLIE_35|$USB_PRODUCT_SONY_CLIE_25|$USB_PRODUCT_SONY_CLIE_TJ37|$USB_PRODUCT_SONY_CLIE_TH55)";
++	match "vendor" "0x054c";
++	match "product" "(0x0066|0x009a|0x0095|0x00da|0x0038|$USB_PRODUCT_SONY_CLIE_25|0x0169|0x0144)";
 +	action "kldload uvisor";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_TAPWAVE";
-+	match "product" "$USB_PRODUCT_TAPWAVE_ZODIAC";
++	match "vendor" "0x12ef";
++	match "product" "0x0100";
 +	action "kldload uvisor";
 +};
 +
 +nomatch 10 {
 +	match "bus" "uhub[0-9]+";
-+	match "vendor" "$USB_VENDOR_SUNTAC";
-+	match "product" "($USB_PRODUCT_SUNTAC_AS144L4|$USB_PRODUCT_SUNTAC_DS96L|$USB_PRODUCT_SUNTAC_IS96U|$USB_PRODUCT_SUNTAC_PS64P1|$USB_PRODUCT_SUNTAC_VS10U)";
++	match "vendor" "0x05db";
++	match "product" "(0x0011|0x0003|0x000a|0x0005|0x0009)";
 +	action "kldload uvscom";
 +};
 +
---- a/etc/devd/Makefile
-+++ b/etc/devd/Makefile
-@@ -1,6 +1,11 @@
- # $FreeBSD$
- 
--FILES=	asus.conf uath.conf
-+FILES=	asus.conf uath.conf usb_ids.conf
-+
-+CLEANFILES+=	usb_ids.conf
-+
-+usb_ids.conf: genusbdevs.sh ../../sys/dev/usb/usbdevs
-+	sh genusbdevs.sh > $@
- 
- NO_OBJ=
- FILESDIR=	/etc/devd
---- /dev/null
-+++ b/etc/devd/genusbdevs.sh
-@@ -0,0 +1,15 @@
-+#!/bin/sh -e
-+
-+echo "options {"
-+
-+grep ^vendor ../../sys/dev/usb/usbdevs | while read dummy vendor_name vendor_id vendor_desc ; do
-+  printf "\t# $vendor_desc\n\tset USB_VENDOR_$vendor_name \"$vendor_id\";\n\n"
-+done
-+
-+grep ^product ../../sys/dev/usb/usbdevs | while read dummy vendor_name product_name product_id product_desc ; do
-+  printf "\t# $product_desc\n\tset USB_PRODUCT_${vendor_name}_${product_name} \"$product_id\";\n\n"
-+done
-+
-+echo "};"
-+
-+exit 0




More information about the Glibc-bsd-commits mailing list