*** empty log message ***

2 files changed, 29 insertions, 25 deletions

diff --git a/sys/dev/usb/upd.c b/sys/dev/usb/upd.c
index 522992e22c0..2348da364d1 100644
--- a/sys/dev/usb/upd.c
+++ b/sys/dev/usb/upd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: upd.c,v 1.3 2014/03/19 16:34:34 andre Exp $ */
+/*	$OpenBSD: upd.c,v 1.4 2014/03/20 12:50:49 andre Exp $ */
 
 /*
  * Copyright (c) 2014 Andre de Oliveira <andre@openbsd.org>
@@ -113,7 +113,33 @@ struct upd_softc {
 static const struct usb_devno upd_devs[] = {
 	{ USB_VENDOR_APC, USB_PRODUCT_APC_UPS },
 	{ USB_VENDOR_APC, USB_PRODUCT_APC_UPS5G },
-	{ USB_VENDOR_LIEBERT, USB_PRODUCT_LIEBERT_UPS }
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C100 },
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1100 },
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C120 },
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1250EITWRK },
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1500EITWRK },
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR },
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C800 },
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C900 },
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6H375 },
+	{ USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500 },
+	{ USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_OR2200 },
+	{ USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_UPS },
+	{ USB_VENDOR_DELL2, USB_PRODUCT_DELL2_UPS },
+	{ USB_VENDOR_HP, USB_PRODUCT_HP_R1500G2 },
+	{ USB_VENDOR_HP, USB_PRODUCT_HP_RT2200 },
+	{ USB_VENDOR_HP, USB_PRODUCT_HP_T1000 },
+	{ USB_VENDOR_HP, USB_PRODUCT_HP_T1500 },
+	{ USB_VENDOR_HP, USB_PRODUCT_HP_T750 },
+	{ USB_VENDOR_HP, USB_PRODUCT_HP_T750G2 },
+	{ USB_VENDOR_IDOWELL, USB_PRODUCT_IDOWELL_IDOWELL },
+	{ USB_VENDOR_LIEBERT, USB_PRODUCT_LIEBERT_UPS },
+	{ USB_VENDOR_LIEBERT2, USB_PRODUCT_LIEBERT2_PSA },
+	{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1 },
+	{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2 },
+	{ USB_VENDOR_OMRON, USB_PRODUCT_OMRON_BX35F },
+	{ USB_VENDOR_OMRON, USB_PRODUCT_OMRON_BX50F },
+	{ USB_VENDOR_OMRON, USB_PRODUCT_OMRON_BY35S }
 };
 #define upd_lookup(v, p) usb_lookup(upd_devs, v, p)
 
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index dbc299669c2..7e80773d0f4 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_quirks.c,v 1.70 2014/03/19 13:45:44 andre Exp $ */
+/*	$OpenBSD: usb_quirks.c,v 1.71 2014/03/20 12:50:49 andre Exp $ */
 /*	$NetBSD: usb_quirks.c,v 1.45 2003/05/10 17:47:14 hamajima Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $	*/
 
@@ -122,34 +122,12 @@ const struct usbd_quirk_entry {
  { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD,		ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD2,		ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SPEAKERS,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C100,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C120,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C800,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C900,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1100,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1250EITWRK,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1500EITWRK,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6H375,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_OR2200, ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SISPM_OLD,	ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SISPM,	ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SISPM_FLASH,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_DELL2, USB_PRODUCT_DELL2_UPS,		ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_HP, USB_PRODUCT_HP_T750,			ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_HP, USB_PRODUCT_HP_T1000,			ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_HP, USB_PRODUCT_HP_T1500,			ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_HP, USB_PRODUCT_HP_RT2200,		ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_HP, USB_PRODUCT_HP_R1500G2,		ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_HP, USB_PRODUCT_HP_T750G2,		ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_IDOWELL, USB_PRODUCT_IDOWELL_IDOWELL,	ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_ITUNER, USB_PRODUCT_ITUNER_USBLCD20x2,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_LIEBERT2, USB_PRODUCT_LIEBERT2_PSA,	ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_MECANIQUE, USB_PRODUCT_MECANIQUE_WISPY,	ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24I,	ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1,		ANY,	{ UQ_BAD_HID }},
- { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2,		ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_MUSTEK2, USB_PRODUCT_MUSTEK2_PM800,	ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_OMRON, USB_PRODUCT_OMRON_BX35F,		ANY,	{ UQ_BAD_HID }},
  { USB_VENDOR_OMRON, USB_PRODUCT_OMRON_BX50F,		ANY,	{ UQ_BAD_HID }},