summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraoyama <aoyama@openbsd.org>2013-10-30 12:28:19 +0000
committeraoyama <aoyama@openbsd.org>2013-10-30 12:28:19 +0000
commitcd38d2fe7fcef5a7698911a763d5f248ffbe9760 (patch)
tree29bbf3a1e31d5c72f032d5bc59cb8061a15eb079
parentAllow to compile a kernel without INET6. (diff)
downloadwireguard-openbsd-cd38d2fe7fcef5a7698911a763d5f248ffbe9760.tar.xz
wireguard-openbsd-cd38d2fe7fcef5a7698911a763d5f248ffbe9760.zip
Treat another OMRON UPS, BY35S, as ugen(4).
Now NUT (sysutils/nut in ports) works on this device, and may work on other OMRON UPSs, by: 1. Apply following diff to NUT source: https://gist.github.com/ao-kenji/7070817 2. Put following setting in /etc/nut/ups.conf. --- [by35s] driver = blazer_usb port = auto desc = "OMRON BY35S" vendorid = 0590 productid = 0080 subdriver = ippon --- Reference: http://sunnyone41.blogspot.jp/2011/05/omron-by50subuntu-1104.html (written in Japanese) ok deraadt@ mpi@
-rw-r--r--sys/dev/usb/usb_quirks.c3
-rw-r--r--sys/dev/usb/usbdevs3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index a5bb32e601b..346b251a8e8 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.68 2013/03/08 02:21:43 jcs Exp $ */
+/* $OpenBSD: usb_quirks.c,v 1.69 2013/10/30 12:28:19 aoyama 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 $ */
@@ -156,6 +156,7 @@ const struct usbd_quirk_entry {
{ 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 }},
+ { USB_VENDOR_OMRON, USB_PRODUCT_OMRON_BY35S, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_TENX, USB_PRODUCT_TENX_MISSILE, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_TERRATEC, USB_PRODUCT_TERRATEC_AUREON, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_TI, USB_PRODUCT_TI_MSP430, ANY, { UQ_BAD_HID }},
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 731a5226df6..8218b0a6f46 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.609 2013/10/25 02:55:58 jeremy Exp $
+$OpenBSD: usbdevs,v 1.610 2013/10/30 12:28:19 aoyama Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -3085,6 +3085,7 @@ product OMNIVISION OV511PLUS 0xa511 OV511+
/* OMRON products */
product OMRON BX50F 0x0057 BX50F UPS
product OMRON BX35F 0x0058 BX35F UPS
+product OMRON BY35S 0x0080 BY35S UPS
/* OnSpec Electronic, Inc. */
product ONSPEC MD2 0x0103 disk