From owner-p4-projects@FreeBSD.ORG Thu Jul 2 18:52:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4456B10656B0; Thu, 2 Jul 2009 18:52:13 +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 F367F106568E for ; Thu, 2 Jul 2009 18:52:12 +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 D9C868FC2D for ; Thu, 2 Jul 2009 18:52:12 +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 n62IqCcZ036705 for ; Thu, 2 Jul 2009 18:52:12 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n62IqCNL036703 for perforce@freebsd.org; Thu, 2 Jul 2009 18:52:12 GMT (envelope-from syl@FreeBSD.org) Date: Thu, 2 Jul 2009 18:52:12 GMT Message-Id: <200907021852.n62IqCNL036703@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 165555 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, 02 Jul 2009 18:52:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=165555 Change 165555 by syl@syl_atuin on 2009/07/02 18:51:35 Fix some compilation error in libusb. Delete some traces in test3. Test3 now works and dump the 512 first bytes of a memory stick. Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/transfers/test3/test3.c#6 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#55 edit Differences ... ==== //depot/projects/soc2009/syl_usb/libusb-tests/transfers/test3/test3.c#6 (text+ko) ==== @@ -58,7 +58,6 @@ int transferred = 0; int ret= 0; - printf("do_io\n"); ret = libusb_bulk_transfer(devh, ep, buff, len, &transferred, timeout); return ret; } @@ -70,7 +69,6 @@ umass_bbb_csw_t csw; int ret = 0; - printf("do_msc\n"); bzero(&cbw, sizeof(cbw)); USETDW(cbw.dCBWSignature, CBWSIGNATURE); @@ -112,7 +110,6 @@ { static uint8_t cmd[10]; - printf("do_read\n"); cmd[0] = 0x28; len /= 512; ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#55 (text+ko) ==== @@ -490,10 +490,12 @@ libusb_unref_device(devh->dev); TAILQ_FOREACH(eptr, &devh->ep_list, list) { TAILQ_REMOVE(&devh->ep_list, eptr, list); - libusb20_tr_close(((libusb20_transfer *)eptr->os_priv)[0]); + libusb20_tr_close(((struct libusb20_transfer **) + eptr->os_priv)[0]); if (eptr->flags) - libusb20_tr_close(((libusb20_transfer *)eptr->os_priv)[1]); - free((libusb20_transfer *)eptr->os_priv); + libusb20_tr_close(((struct libusb20_transfer **) + eptr->os_priv)[1]); + free((struct libusb20_transfer **)eptr->os_priv); } free(devh); @@ -514,10 +516,12 @@ libusb_unref_device(devh->dev); TAILQ_FOREACH(eptr, &devh->ep_list, list) { TAILQ_REMOVE(&devh->ep_list, eptr, list); - libusb20_tr_close(((libusb20_transfer *)eptr->os_priv)[0]); + libusb20_tr_close(((struct libusb20_transfer **) + eptr->os_priv)[0]); if (eptr->flags) - libusb20_tr_close(((libusb20_transfer *)eptr->os_priv)[1]); - free((libusb20_transfer *)eptr->os_priv); + libusb20_tr_close(((struct libusb20_transfer **) + eptr->os_priv)[1]); + free((struct libusb20_transfer **)eptr->os_priv); } free(devh); @@ -1088,7 +1092,7 @@ out: pthread_mutex_unlock(&ctx->flying_transfers_lock); - ep_idx = (xfer->endpoints / 0x40) | (xfer->endpoints *4) % (16 * 4); + ep_idx = (xfer->endpoint / 0x40) | (xfer->endpoint * 4) % (16 * 4); usb20_xfer[0] = libusb20_tr_get_pointer(pdev, ep_idx); usb20_xfer[1] = libusb20_tr_get_pointer(pdev, ep_idx + 1); @@ -1108,11 +1112,11 @@ ret++; } if (ret == 0) { - eptr = malloc(sizeof(usb_ep_tr)); - eptr.addr = xfer->endpoint; - eptr.idx = ep_idx; - eptr.os_priv = usb20_xfer; - eptr.flags = (xfer->type == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS)?1:0; + eptr = malloc(sizeof(struct usb_ep_tr)); + eptr->addr = xfer->endpoint; + eptr->idx = ep_idx; + eptr->os_priv = usb20_xfer; + eptr->flags = (xfer->type == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS)?1:0; TAILQ_INSERT_HEAD(&devh->ep_list, eptr, list); ret = libusb20_tr_open(usb20_xfer[0], buffsize, maxframe, xfer->endpoint);