From owner-p4-projects@FreeBSD.ORG Thu Nov 13 20:20:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 665E4106567D; Thu, 13 Nov 2008 20:20:39 +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 2AF561065679 for ; Thu, 13 Nov 2008 20:20:39 +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 1B3768FC1A for ; Thu, 13 Nov 2008 20:20:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mADKKcD3073102 for ; Thu, 13 Nov 2008 20:20:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mADKKc5Z073100 for perforce@freebsd.org; Thu, 13 Nov 2008 20:20:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 13 Nov 2008 20:20:38 GMT Message-Id: <200811132020.mADKKc5Z073100@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 152943 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: Thu, 13 Nov 2008 20:20:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=152943 Change 152943 by hselasky@hselasky_laptop001 on 2008/11/13 20:20:25 Style. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.c#11 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#11 (text+ko) ==== @@ -647,7 +647,7 @@ int libusb20_dev_req_string_sync(struct libusb20_device *pdev, - uint8_t strIndex, uint16_t langid, void *ptr, uint16_t len) + uint8_t str_index, uint16_t langid, void *ptr, uint16_t len) { struct LIBUSB20_CONTROL_SETUP_DECODED req; int error; @@ -667,7 +667,7 @@ LIBUSB20_RECIPIENT_DEVICE | LIBUSB20_ENDPOINT_IN; req.bRequest = LIBUSB20_REQUEST_GET_DESCRIPTOR; - req.wValue = (LIBUSB20_DT_STRING << 8) | strIndex; + req.wValue = (LIBUSB20_DT_STRING << 8) | str_index; req.wIndex = langid; req.wLength = 4; /* bytes */ @@ -695,7 +695,7 @@ int libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, - uint8_t strIndex, void *ptr, uint16_t len) + uint8_t str_index, void *ptr, uint16_t len) { char *buf; int error; @@ -720,7 +720,7 @@ } langid = temp[2] | (temp[3] << 8); - error = libusb20_dev_req_string_sync(pdev, strIndex, + error = libusb20_dev_req_string_sync(pdev, str_index, langid, temp, sizeof(temp)); if (error < 0) { *(uint8_t *)ptr = 0; /* zero terminate */