summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2004-10-26 00:37:08 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2004-10-26 00:37:08 +0000
commit5c827e48d6804f9eb34b5b13b1e611ed56a90b18 (patch)
tree837aa3fb5f1718453f572110a2060fd3a9ec55bf
parent735ca284ce23f5eed8add0f860e7dddf0d113521 (diff)
Add Pharos GPS. From NetBSD.
-rw-r--r--share/man/man4/uplcom.43
-rw-r--r--sys/dev/usb/uplcom.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/share/man/man4/uplcom.4 b/share/man/man4/uplcom.4
index da487591a75..1e2ec1a2dcd 100644
--- a/share/man/man4/uplcom.4
+++ b/share/man/man4/uplcom.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uplcom.4,v 1.9 2004/09/30 19:59:26 mickey Exp $
+.\" $OpenBSD: uplcom.4,v 1.10 2004/10/26 00:37:07 jsg Exp $
.\" $NetBSD: uplcom.4,v 1.6 2001/05/22 00:21:25 jhawk Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -57,6 +57,7 @@ driver supports the following adapters:
.It I/O DATA USB-RSAQ
.It I/O DATA USB-RSAQ2
.It IOGEAR UC-232A
+.It Pharos USB GPS
.It PLANEX USB-RS232 URS-03
.It RATOC REX-USB60
.It Sitecom USB-Serial CNA-104
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 0fd2da36f28..625a8210d9f 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uplcom.c,v 1.15 2004/09/20 21:34:46 deraadt Exp $ */
+/* $OpenBSD: uplcom.c,v 1.16 2004/10/26 00:37:07 jsg Exp $ */
/* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -172,6 +172,8 @@ static const struct usb_devno uplcom_devs[] = {
{ USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU11 },
/* Sitecom USB to Serial. */
{ USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_CN104 },
+ /* Pharos USB GPS - Microsoft version */
+ { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X },
/* SOURCENEXT KeikaiDenwa 8 */
{ USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8 },
/* SOURCENEXT KeikaiDenwa 8 with charger */