From owner-p4-projects@FreeBSD.ORG Wed May 5 19:56:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37C8A1065747; Wed, 5 May 2010 19:56:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B1D5106566C for ; Wed, 5 May 2010 19:56:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2107A8FC0A for ; Wed, 5 May 2010 19:56:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o45Jua3r060767 for ; Wed, 5 May 2010 19:56:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o45JuZvv060765 for perforce@freebsd.org; Wed, 5 May 2010 19:56:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 5 May 2010 19:56:35 GMT Message-Id: <201005051956.o45JuZvv060765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2010 19:56:37 -0000 http://p4web.freebsd.org/@@177778?ac=10 Change 177778 by hselasky@hselasky_laptop001 on 2010/05/05 19:56:30 USB debugging: - post-integrate some missing #if -> #ifdef changes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#40 integrate .. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#51 edit .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#44 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#67 edit .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#31 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#40 (text+ko) ==== @@ -72,7 +72,7 @@ /* static variables */ -#if USB_DEBUG +#ifdef USB_DEBUG static int usb_ctrl_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller"); ==== //depot/projects/usb/src/sys/dev/usb/net/uhso.c#4 (text+ko) ==== @@ -280,7 +280,7 @@ SYSCTL_INT(_hw_usb_uhso, OID_AUTO, auto_switch, CTLFLAG_RW, &uhso_autoswitch, 0, "Automatically switch to modem mode"); -#if USB_DEBUG +#ifdef USB_DEBUG #ifdef UHSO_DEBUG static int uhso_debug = UHSO_DEBUG; #else ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#51 (text+ko) ==== @@ -2147,7 +2147,7 @@ static void umass_cam_attach(struct umass_softc *sc) { -#if (USB_DEBUG == 0) +#ifndef USB_DEBUG if (bootverbose) #endif printf("%s:%d:%d:%d: Attached to scbus%d\n", ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#20 (text+ko) ==== @@ -440,7 +440,7 @@ pc->page_offset_buf = rem; pc->page_offset_end += rem; nseg--; -#if USB_DEBUG +#ifdef USB_DEBUG if (rem != (USB_P2U(pc->buffer) & (USB_PAGE_SIZE - 1))) { /* * This check verifies that the physical address is correct: ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#44 (text+ko) ==== @@ -79,7 +79,7 @@ #if USB_HAVE_UGEN -#if USB_DEBUG +#ifdef USB_DEBUG static int usb_fifo_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, dev, CTLFLAG_RW, 0, "USB device"); ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#67 (text+ko) ==== @@ -2617,7 +2617,7 @@ void usbd_sr_lock(struct usb_device *udev) { - sx_xlock(udev->default_sx + 2); + sx_xlock(&udev->sr_sx); /* * NEWBUS LOCK NOTE: We should check if any parent SX locks * are locked before locking Giant. Else the lock can be @@ -2632,7 +2632,7 @@ usbd_sr_unlock(struct usb_device *udev) { mtx_unlock(&Giant); - sx_xunlock(udev->default_sx + 2); + sx_xunlock(&udev->sr_sx); } /* ==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#29 (text+ko) ==== @@ -124,7 +124,7 @@ .f_stop_write = &ugen_stop_io, }; -#if USB_DEBUG +#ifdef USB_DEBUG static int ugen_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ugen, CTLFLAG_RW, 0, "USB generic"); ==== //depot/projects/usb/src/sys/dev/usb/usb_process.c#17 (text+ko) ==== @@ -77,7 +77,7 @@ #define USB_THREAD_EXIT(err) kthread_exit(err) #endif -#if USB_DEBUG +#ifdef USB_DEBUG static int usb_proc_debug; SYSCTL_NODE(_hw_usb, OID_AUTO, proc, CTLFLAG_RW, 0, "USB process"); ==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#31 (text+ko) ==== @@ -126,7 +126,7 @@ #endif -#if USB_DEBUG +#ifdef USB_DEBUG /*------------------------------------------------------------------------* * usbd_get_debug_bits * @@ -373,7 +373,7 @@ struct usb_device_request *req, void *data, uint16_t flags, uint16_t *actlen, usb_timeout_t timeout) { -#if USB_DEBUG +#ifdef USB_DEBUG struct usb_ctrl_debug_bits dbg; #endif usb_handle_req_t *hr_func; @@ -504,7 +504,7 @@ goto done; } -#if USB_DEBUG +#ifdef USB_DEBUG /* Get debug bits */ usbd_get_debug_bits(udev, req, &dbg); @@ -539,7 +539,7 @@ if (temp > usbd_xfer_max_len(xfer)) { temp = usbd_xfer_max_len(xfer); } -#if USB_DEBUG +#ifdef USB_DEBUG if (xfer->flags.manual_status) { if (usbd_xfer_frame_len(xfer, 0) != 0) { /* Execute data stage separately */