summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorNathan Binkert <nate@cvs.openbsd.org>2002-07-09 17:15:39 +0000
committerNathan Binkert <nate@cvs.openbsd.org>2002-07-09 17:15:39 +0000
commitc5f32bc7bd50160e24870d078eceb2855d21c772 (patch)
tree169e2ca2a55a4aaf7b59bd84819eb4e5c0995f7d /sys/dev
parente13e34789a41fa3384ca4403af43b3912dea5673 (diff)
New device From NetBSD
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/uvisor.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index c54ba16927a..d6a01ae6286 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uvisor.c,v 1.7 2002/05/07 20:19:25 nate Exp $ */
-/* $NetBSD: uvisor.c,v 1.14 2002/02/27 23:00:03 augustss Exp $ */
+/* $OpenBSD: uvisor.c,v 1.8 2002/07/09 17:15:38 nate Exp $ */
+/* $NetBSD: uvisor.c,v 1.15 2002/06/16 15:01:31 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -162,6 +162,7 @@ static const struct uvisor_type uvisor_devs[] = {
{{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M505 }, PALM4 },
{{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M125 }, PALM4 },
{{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40 }, PALM4 },
+ {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41 }, 0 },
/* {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_25 }, PALM4 },*/
};
#define uvisor_lookup(v, p) ((struct uvisor_type *)usb_lookup(uvisor_devs, v, p))
@@ -360,7 +361,7 @@ uvisor_init(struct uvisor_softc *sc, struct uvisor_connection_info *ci)
USETW(req.wIndex, 0);
USETW(req.wLength, UVISOR_CONNECTION_INFO_SIZE);
err = usbd_do_request_flags(sc->sc_udev, &req, ci,
- USBD_SHORT_XFER_OK, &actlen);
+ USBD_SHORT_XFER_OK, &actlen, USBD_DEFAULT_TIMEOUT);
if (err)
return (err);
@@ -416,5 +417,5 @@ uvisor_close(void *addr, int portno)
USETW(req.wIndex, 0);
USETW(req.wLength, UVISOR_CONNECTION_INFO_SIZE);
(void)usbd_do_request_flags(sc->sc_udev, &req, &coninfo,
- USBD_SHORT_XFER_OK, &actlen);
+ USBD_SHORT_XFER_OK, &actlen, USBD_DEFAULT_TIMEOUT);
}