Deleted Added
sdiff udiff text old ( 190749 ) new ( 192499 )
full compact
uvisor.c (190749) uvisor.c (192499)
1/* $NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $ */
1/* $NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $ */
2/* $FreeBSD: head/sys/dev/usb/serial/uvisor.c 190749 2009-04-05 21:24:15Z piso $ */
2/* $FreeBSD: head/sys/dev/usb/serial/uvisor.c 192499 2009-05-21 00:04:17Z thompsa $ */
3
4/* Also already merged from NetBSD:
5 * $NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $
6 * $NetBSD: uvisor.c,v 1.13 2002/02/11 15:11:49 augustss Exp $
7 * $NetBSD: uvisor.c,v 1.14 2002/02/27 23:00:03 augustss Exp $
8 * $NetBSD: uvisor.c,v 1.15 2002/06/16 15:01:31 augustss Exp $
9 * $NetBSD: uvisor.c,v 1.16 2002/07/11 21:14:36 augustss Exp $
10 * $NetBSD: uvisor.c,v 1.17 2002/08/13 11:38:15 augustss Exp $

--- 257 unchanged lines hidden (view full) ---

268 {USB_VPI(USB_VENDOR_TAPWAVE, USB_PRODUCT_TAPWAVE_ZODIAC, UVISOR_FLAG_PALM4)},
269};
270
271static int
272uvisor_probe(device_t dev)
273{
274 struct usb2_attach_arg *uaa = device_get_ivars(dev);
275
3
4/* Also already merged from NetBSD:
5 * $NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $
6 * $NetBSD: uvisor.c,v 1.13 2002/02/11 15:11:49 augustss Exp $
7 * $NetBSD: uvisor.c,v 1.14 2002/02/27 23:00:03 augustss Exp $
8 * $NetBSD: uvisor.c,v 1.15 2002/06/16 15:01:31 augustss Exp $
9 * $NetBSD: uvisor.c,v 1.16 2002/07/11 21:14:36 augustss Exp $
10 * $NetBSD: uvisor.c,v 1.17 2002/08/13 11:38:15 augustss Exp $

--- 257 unchanged lines hidden (view full) ---

268 {USB_VPI(USB_VENDOR_TAPWAVE, USB_PRODUCT_TAPWAVE_ZODIAC, UVISOR_FLAG_PALM4)},
269};
270
271static int
272uvisor_probe(device_t dev)
273{
274 struct usb2_attach_arg *uaa = device_get_ivars(dev);
275
276 if (uaa->usb2_mode != USB_MODE_HOST) {
276 if (uaa->usb_mode != USB_MODE_HOST) {
277 return (ENXIO);
278 }
279 if (uaa->info.bConfigIndex != UVISOR_CONFIG_INDEX) {
280 return (ENXIO);
281 }
282 if (uaa->info.bIfaceIndex != UVISOR_IFACE_INDEX) {
283 return (ENXIO);
284 }

--- 331 unchanged lines hidden --- 		277 return (ENXIO);
278 }
279 if (uaa->info.bConfigIndex != UVISOR_CONFIG_INDEX) {
280 return (ENXIO);
281 }
282 if (uaa->info.bIfaceIndex != UVISOR_IFACE_INDEX) {
283 return (ENXIO);
284 }

--- 331 unchanged lines hidden ---