From owner-p4-projects@FreeBSD.ORG Wed Dec 12 22:40:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5846316A41B; Wed, 12 Dec 2007 22:40:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF5D616A417 for ; Wed, 12 Dec 2007 22:40:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ECC6813C44B for ; Wed, 12 Dec 2007 22:40:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCMeKZp077512 for ; Wed, 12 Dec 2007 22:40:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCMeKGh077509 for perforce@freebsd.org; Wed, 12 Dec 2007 22:40:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 22:40:20 GMT Message-Id: <200712122240.lBCMeKGh077509@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 Cc: Subject: PERFORCE change 130744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 22:40:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=130744 Change 130744 by hselasky@hselasky_laptop001 on 2007/12/12 22:39:22 Refactor "usbreq_reset_port" a little bit. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_requests.c#12 (text+ko) ==== @@ -54,62 +54,50 @@ * usbreq_reset_port *------------------------------------------------------------------------*/ usbd_status_t -usbreq_reset_port(struct usbd_device *udev, struct mtx *mtx, - usb_port_status_t *ps, uint8_t port) +usbreq_reset_port(struct usbd_device *udev, struct mtx *mtx, uint8_t port) { - usb_device_request_t req; + usb_port_status_t ps; usbd_status_t err; uint8_t n; - req.bmRequestType = UT_WRITE_CLASS_OTHER; - req.bRequest = UR_SET_FEATURE; - USETW(req.wValue, UHF_PORT_RESET); - req.wIndex[0] = port; - req.wIndex[1] = 0; - USETW(req.wLength, 0); - err = usbd_do_request(udev, mtx, &req, 0); - - PRINTFN(1, ("port %d reset done, error=%s\n", - port, usbd_errstr(err))); - + err = usbreq_set_port_feature(udev, mtx, port, UHF_PORT_RESET); if (err) { goto done; } - n = 12; - do { - /* wait for device to recover from reset */ + for (n = 12; n != 0; n--) { + + /* wait for the device to recover from reset */ usbd_pause_mtx(mtx, USB_PORT_RESET_DELAY); - err = usbreq_get_port_status(udev, mtx, ps, port); - + err = usbreq_get_port_status(udev, mtx, &ps, port); if (err) { - PRINTF(("get status failed %d\n", - err)); goto done; } /* if the device disappeared, just give up */ - if (!(UGETW(ps->wPortStatus) & UPS_CURRENT_CONNECT_STATUS)) { - err = USBD_NORMAL_COMPLETION; + if (!(UGETW(ps.wPortStatus) & UPS_CURRENT_CONNECT_STATUS)) { goto done; } - if (n == 0) { - err = USBD_TIMEOUT; - goto done; - } else { - n--; + /* check if reset is complete */ + if (UGETW(ps.wPortChange) & UPS_C_PORT_RESET) { + break; } - } while ((UGETW(ps->wPortChange) & UPS_C_PORT_RESET) == 0); + } - err = usbreq_clear_port_feature(udev, mtx, port, UHF_C_PORT_RESET); -#ifdef USB_DEBUG + /* clear port reset first */ + err = usbreq_clear_port_feature( + udev, mtx, port, UHF_C_PORT_RESET); if (err) { - PRINTF(("clear port feature failed %d\n", - err)); + goto done; + } + /* check for timeout */ + if (n == 0) { + err = USBD_TIMEOUT; + goto done; } -#endif - /* wait for the device to recover from reset */ usbd_pause_mtx(mtx, USB_PORT_RESET_RECOVERY); done: + PRINTFN(1, ("port %d reset returning error=%s\n", + port, usbd_errstr(err))); return (err); } @@ -217,7 +205,7 @@ /* this is the language table */ return (USBD_INVAL); } - if (udev->no_strings) { + if (udev->flags.no_strings) { return (USBD_STALLED); } swap = (udev->quirks->uq_flags & UQ_SWAP_UNICODE) ? 1 : 0;