PERFORCE change 165555 for review

[Sylvestre Gallon]

http://perforce.freebsd.org/chv.cgi?CH=165555

Change 165555 by syl at 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);