From owner-p4-projects@FreeBSD.ORG Wed May 6 19:02:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 246CA106566B; Wed, 6 May 2009 19:02:01 +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 BF58F1065675 for ; Wed, 6 May 2009 19:02:00 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADB078FC17 for ; Wed, 6 May 2009 19:02:00 +0000 (UTC) (envelope-from syl@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 n46J20qx010525 for ; Wed, 6 May 2009 19:02:00 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n46J20Cw010523 for perforce@freebsd.org; Wed, 6 May 2009 19:02:00 GMT (envelope-from syl@FreeBSD.org) Date: Wed, 6 May 2009 19:02:00 GMT Message-Id: <200905061902.n46J20Cw010523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 161666 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, 06 May 2009 19:02:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=161666 Change 161666 by syl@syl_atuin on 2009/05/06 19:01:12 Rename all transfer to xfer. No functional change. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#4 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#4 (text+ko) ==== @@ -455,33 +455,33 @@ struct libusb_transfer * libusb_alloc_transfer(int iso_packets) { - struct libusb_transfer *tr; + struct libusb_transfer *xfer; int len; len = sizeof(libusb_transfer) + (iso_packets * sizeof(libusb_iso_packet_descriptor)); - tr = malloc(len); - if (tr == NULL) + xfer = malloc(len); + if (xfer == NULL) return (NULL); - memset(tr, 0, len); + memset(xfer, 0, len); - return (tr); + return (xfer); } void -libusb_free_transfer(struct libusb_transfer *tr) +libusb_free_transfer(struct libusb_transfer *xfer) { - if (tr == NULL) + if (xfer == NULL) return ; - if (tr->buffer) - free(tr->buffer); - if (tr->user_data) - free(tr->user_data); + if (xfer->buffer) + free(xfer->buffer); + if (xfer->user_data) + free(xfer->user_data); - free(tr); + free(xfer); return; } @@ -492,22 +492,21 @@ } int -libusb_submit_transfer(struct libusb_transfer *tr) +libusb_submit_transfer(struct libusb_transfer *xfer) { - struct libusb20_transfer xfer; + struct libusb20_transfer usb20_xfer; int ret; - libusb20_tr_open(&xfer, tr->length, tr->num_iso_packets, tr->endpoint); - libusb20_tr_set_timeout(&xfer, tr->timeout); - libusb20_tr_set_buffer(&xfer, tr->buffer, tr->num_iso_packets); - libusb20_tr_set_length(&xfer, tr->length, tr->num_iso_packets); - libusb20_tr_set_priv_sc0(&xfer, tr->callback); - libusb20_tr_set_priv_sc1(&xfer, tr->user_data); - libusb20_tr_set_callback(&xfer, libusb10_proxy); - libusb20_tr_submit(&xfer); + libusb20_tr_open(&usb20_xfer, xfer->length, xfer->num_iso_packets, xfer->endpoint); + libusb20_tr_set_timeout(&usb20_xfer, xfer->timeout); + libusb20_tr_set_buffer(&usb20_xfer, xfer->buffer, xfer->num_iso_packets); + libusb20_tr_set_length(&usb20_xfer, xfer->length, xfer->num_iso_packets); + libusb20_tr_set_priv_sc0(&usb20_xfer, xfer->callback); + libusb20_tr_set_priv_sc1(&usb20_xfer, xfer->user_data); + libusb20_tr_set_callback(&usb20_xfer, libusb10_proxy); + libusb20_tr_submit(&usb20_xfer); - switch (libusb20_tr_get_status(&xfer)) { - case 1: + switch (libusb20_tr_get_status(&usb20_xfer)) { default: ret = LIBUSB_ERROR_OTHER; } @@ -515,7 +514,7 @@ } int -libusb_cancel_transfer(struct libusb_transfer *transfer) +libusb_cancel_transfer(struct libusb_transfer *xfer) { return (0); } @@ -626,7 +625,7 @@ uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout) { - struct libusb_transfer *tr; + struct libusb_transfer *xfer; struct libusb_control_setup *ctr; unsigned char *buff; int complet; @@ -635,13 +634,13 @@ if (devh == NULL || data == NULL) return (LIBUSB_ERROR_NO_MEM); - tr = libusb_alloc_transfer(0); - if (tr == NULL) + xfer = libusb_alloc_transfer(0); + if (xfer == NULL) return (LIBUSB_ERROR_NO_MEM); buff = malloc(sizeof(libusb_control_setup) + wLength); if (buff == NULL) { - libusb_free_transfer(tr); + libusb_free_transfer(xfer); return (LIBUSB_ERROR_NO_MEM); } @@ -654,26 +653,26 @@ if ((bmRequestType & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_OUT) memcpy(buff + sizeof(libusb_control_setup), data, wLength); - tr->dev_handle = devh; - tr->endpoint = 0; - tr->type = LIBUSB_TRANSFER_TYPE_CONTROL; - tr->timeout = timeout; - tr->buffer = buff; - tr->length = sizeof(libusb_control_setup) + wLength; - tr->user_data = &complet; - tr->callback = ctrl_tr_cb; - tr->flags = LIBUSB_TRANSFER_FREE_TRANSFER; + xfer->dev_handle = devh; + xfer->endpoint = 0; + xfer->type = LIBUSB_TRANSFER_TYPE_CONTROL; + xfer->timeout = timeout; + xfer->buffer = buff; + xfer->length = sizeof(libusb_control_setup) + wLength; + xfer->user_data = &complet; + xfer->callback = ctrl_tr_cb; + xfer->flags = LIBUSB_TRANSFER_FREE_TRANSFER; complet = 0; - if ((ret = libusb_submit_transfer(tr)) < 0) { - libusb_free_transfer(tr); + if ((ret = libusb_submit_transfer(xfer)) < 0) { + libusb_free_transfer(xfer); return (ret); } while (!complet) if ((ret = libusb_handle_events(devh->dev->ctx)) < 0) { - libusb_cancel_transfer(tr); - libusb_free_transfer(tr); + libusb_cancel_transfer(xfer); + libusb_free_transfer(xfer); while (!complet) if (libusb_handle_events(devh->dev->ctx)) break; @@ -683,19 +682,19 @@ if ((bmRequestType & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_IN) memcpy(data, buff + sizeof(libusb_control_setup), wLength); - switch (tr->status) { + switch (xfer->status) { case LIBUSB_TRANSFER_COMPLETED: - ret = tr->actual_length; + ret = xfer->actual_length; break; case LIBUSB_TRANSFER_TIMED_OUT: case LIBUSB_TRANSFER_STALL: case LIBUSB_TRANSFER_NO_DEVICE: - ret = tr->status; + ret = xfer->status; break; default: ret = LIBUSB_ERROR_OTHER; } - libusb_free_transfer(tr); + libusb_free_transfer(xfer); return (ret); } @@ -704,58 +703,58 @@ unsigned char endpoint, unsigned char *data, int length, int *transferred, unsigned int timeout) { - struct libusb_transfer *tr; + struct libusb_transfer *xfer; int complet; int ret; if (devh == NULL || data == NULL) return (LIBUSB_ERROR_NO_MEM); - tr = libusb_alloc_transfer(0); - if (tr == NULL) + xfer = libusb_alloc_transfer(0); + if (xfer == NULL) return (LIBUSB_ERROR_NO_MEM); - tr->dev_handle = devh; - tr->endpoint = endpoint; - tr->type = LIBUSB_TRANSFER_TYPE_BULK; - tr->timeout = timeout; - tr->buffer = data; - tr->length = length; - tr->user_data = &complet; - tr->callback = ctrl_tr_cb; + xfer->dev_handle = devh; + xfer->endpoint = endpoint; + xfer->type = LIBUSB_TRANSFER_TYPE_BULK; + xfer->timeout = timeout; + xfer->buffer = data; + xfer->length = length; + xfer->user_data = &complet; + xfer->callback = ctrl_tr_cb; complet = 0; - if ((ret = libusb_submit_transfer(tr)) < 0) { - libusb_free_transfer(tr); + if ((ret = libusb_submit_transfer(xfer)) < 0) { + libusb_free_transfer(xfer); return (ret); } while (!complet) if ((ret = libusb_handle_events(devh->dev->ctx)) < 0) { - libusb_cancel_transfer(tr); - libusb_free_transfer(tr); + libusb_cancel_transfer(xfer); + libusb_free_transfer(xfer); while (!complet) if (libusb_handle_events(devh->dev->ctx)) break; return (ret); } - *transferred = tr->actual_length; - switch (tr->status) { + *transferred = xfer->actual_length; + switch (xfer->status) { case LIBUSB_TRANSFER_COMPLETED: - ret = tr->actual_length; + ret = xfer->actual_length; break; case LIBUSB_TRANSFER_TIMED_OUT: case LIBUSB_TRANSFER_OVERFLOW: case LIBUSB_TRANSFER_STALL: case LIBUSB_TRANSFER_NO_DEVICE: - ret = tr->status; + ret = xfer->status; break; default: ret = LIBUSB_ERROR_OTHER; } - libusb_free_transfer(tr); + libusb_free_transfer(xfer); return (0); }