r1302 - trunk/src/host/dfu-util/src

werner at sita.openmoko.org werner at sita.openmoko.org
Fri Mar 9 11:16:25 CET 2007


Author: werner
Date: 2007-03-09 11:16:13 +0100 (Fri, 09 Mar 2007)
New Revision: 1302

Modified:
   trunk/src/host/dfu-util/src/main.c
Log:
main.c (main): moved alternate setting lookup to so that print_dfu_if prints
  the correct information; removed now superfluous success report



Modified: trunk/src/host/dfu-util/src/main.c
===================================================================
--- trunk/src/host/dfu-util/src/main.c	2007-03-09 09:14:48 UTC (rev 1301)
+++ trunk/src/host/dfu-util/src/main.c	2007-03-09 10:16:13 UTC (rev 1302)
@@ -540,6 +540,22 @@
 		 * procedure */
 	}
 
+	if (alt_name) {
+		int n;
+
+		n = find_dfu_if(dif->dev, &alt_by_name, alt_name);
+		if (!n) {
+			fprintf(stderr, "No such Alternate Setting: \"%s\"\n",
+			    alt_name);
+			exit(1);
+		}
+		if (n < 0) {
+			fprintf(stderr, "Error %d in name lookup\n", n);
+			exit(1);
+		}
+		dif->altsetting = n-1;
+	}
+
 	print_dfu_if(dif, NULL);
 
 	num_ifs = count_dfu_interfaces(dif->dev);
@@ -571,23 +587,6 @@
 		exit(1);
 	}
 
-	if (alt_name) {
-		int n;
-
-		n = find_dfu_if(dif->dev, &alt_by_name, alt_name);
-		if (!n) {
-			fprintf(stderr, "No such Alternate Setting: \"%s\"\n",
-			    alt_name);
-			exit(1);
-		}
-		if (n < 0) {
-			fprintf(stderr, "Error %d in name lookup\n", n);
-			exit(1);
-		}
-		dif->altsetting = n-1;
-		printf("Looked up \"%s\" = %d\n", alt_name, dif->altsetting);
-	}
-
 	printf("Setting Alternate Setting ...\n");
 	if (usb_set_altinterface(dif->dev_handle, dif->altsetting) < 0) {
 		fprintf(stderr, "Cannot set alternate interface: %s\n",





More information about the commitlog mailing list