Deleted Added
sdiff udiff text old ( 205032 ) new ( 207077 )
full compact
uvisor.c (205032) uvisor.c (207077)
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 205032 2010-03-11 21:47:25Z thompsa $ */
2/* $FreeBSD: head/sys/dev/usb/serial/uvisor.c 207077 2010-04-22 21:31:34Z 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 $

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

73#include "usbdevs.h"
74
75#define USB_DEBUG_VAR uvisor_debug
76#include <dev/usb/usb_debug.h>
77#include <dev/usb/usb_process.h>
78
79#include <dev/usb/serial/usb_serial.h>
80
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 $

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

73#include "usbdevs.h"
74
75#define USB_DEBUG_VAR uvisor_debug
76#include <dev/usb/usb_debug.h>
77#include <dev/usb/usb_process.h>
78
79#include <dev/usb/serial/usb_serial.h>
80
81#if USB_DEBUG
81#ifdef USB_DEBUG
82static int uvisor_debug = 0;
83
84SYSCTL_NODE(_hw_usb, OID_AUTO, uvisor, CTLFLAG_RW, 0, "USB uvisor");
85SYSCTL_INT(_hw_usb_uvisor, OID_AUTO, debug, CTLFLAG_RW,
86 &uvisor_debug, 0, "Debug level");
87#endif
88
89#define UVISOR_CONFIG_INDEX 0

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

387 err = usbd_do_request_flags(udev, NULL,
388 &req, &coninfo, USB_SHORT_XFER_OK,
389 &actlen, USB_DEFAULT_TIMEOUT);
390
391 if (err) {
392 goto done;
393 }
394 }
82static int uvisor_debug = 0;
83
84SYSCTL_NODE(_hw_usb, OID_AUTO, uvisor, CTLFLAG_RW, 0, "USB uvisor");
85SYSCTL_INT(_hw_usb_uvisor, OID_AUTO, debug, CTLFLAG_RW,
86 &uvisor_debug, 0, "Debug level");
87#endif
88
89#define UVISOR_CONFIG_INDEX 0

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

387 err = usbd_do_request_flags(udev, NULL,
388 &req, &coninfo, USB_SHORT_XFER_OK,
389 &actlen, USB_DEFAULT_TIMEOUT);
390
391 if (err) {
392 goto done;
393 }
394 }
395#if USB_DEBUG
395#ifdef USB_DEBUG
396 if (sc->sc_flag & UVISOR_FLAG_VISOR) {
397 uint16_t i, np;
398 const char *desc;
399
400 np = UGETW(coninfo.num_ports);
401 if (np > UVISOR_MAX_CONN) {
402 np = UVISOR_MAX_CONN;
403 }

--- 246 unchanged lines hidden --- 		396 if (sc->sc_flag & UVISOR_FLAG_VISOR) {
397 uint16_t i, np;
398 const char *desc;
399
400 np = UGETW(coninfo.num_ports);
401 if (np > UVISOR_MAX_CONN) {
402 np = UVISOR_MAX_CONN;
403 }

--- 246 unchanged lines hidden ---