summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/usb/usbdevs6
-rw-r--r--sys/dev/usb/uslcom.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index fd99f6564ee..e90fe44e058 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.556 2011/09/16 13:07:39 yuo Exp $
+$OpenBSD: usbdevs,v 1.557 2011/09/16 13:36:18 yuo Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -547,6 +547,7 @@ vendor STRAWBERRYLINUX 0x1774 Strawberry linux Co., Ltd.
vendor SWEEX2 0x177f Sweex
vendor MECANIQUE 0x1781 Mecanique
vendor DISPLAYLINK 0x17e9 DisplayLink
+vendor VAISALA 0x1843 VAISALA
vendor AMIT 0x18c5 AMIT
vendor QCOM 0x18e8 Qcom
vendor LINKSYS3 0x1915 Linksys
@@ -3858,6 +3859,9 @@ product OPTION GTHSDPA225 0x6971 GlobeTrotter HSDPA Icon 225
product OPTION GTHSUPA380E 0x7211 GlobeTrotter HSUPA 380E
product OPTION GTICON322 0xd033 GlobeTrotter Icon322 storage
+/* Vaisala Products */
+product VAISALA USBINSTCABLE 0x0200 USB instrument cable
+
/* WCH/QinHeng Electronics */
product WCH CH341 0x5523 CH341 serial/parallel
product WCH2 CH341A 0x5523 CH341A serial/parallel
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index 7136167aa9a..1debb39c4da 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uslcom.c,v 1.23 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: uslcom.c,v 1.24 2011/09/16 13:36:18 yuo Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -142,7 +142,8 @@ static const struct usb_devno uslcom_devs[] = {
{ USB_VENDOR_SILABS, USB_PRODUCT_SILABS_USBWAVE12 },
{ USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE },
{ USB_VENDOR_SILABS3, USB_PRODUCT_SILABS3_GPRS_MODEM },
- { USB_VENDOR_USI, USB_PRODUCT_USI_MC60 }
+ { USB_VENDOR_USI, USB_PRODUCT_USI_MC60 },
+ { USB_VENDOR_VAISALA, USB_PRODUCT_VAISALA_USBINSTCABLE }
};
int uslcom_match(struct device *, void *, void *);