Fixing the automatic scan for available SPEC boards

3b3364b0 · garcialasheras · 5154cd5e · 3b3364b0
Commit 3b3364b0 authored May 28, 2014 by garcialasheras
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 26 deletions

speclib.c tools/speclib.c +21 -26

No files found.
--- a/tools/speclib.c
+++ b/tools/speclib.c
@@ -82,43 +82,38 @@ static int spec_check_id(int bus, int dev)
 static int spec_scan(int *bus, int *devfn)
 {
 	struct dirent **namelist;
-	int n, found = 0;
+	int n, i, found = 0;
 	int my_bus, my_devfn;

-	if (*bus < 0 || *devfn < 0)
+	// Automatic search for the first availabe card
+	n = scandir("/sys/bus/pci/devices/", &namelist, 0, 0);
+	if (n < 0)
 	{
-		// Automatic search for the first availabe card
-		n = scandir("/sys/bus/pci/devices/", &namelist, 0, 0);
-		if (n < 0)
+		perror("scandir");
+		exit(-1);
+	} else {
+		for(i=0; i<n; i++)
 		{
-			perror("scandir");
-			exit(-1);
-		} else {
-			while (n--)
+			if(!found && sscanf(namelist[i]->d_name,
+					    "0000:%02x:%02x.0",
+					    &my_bus, &my_devfn) == 2)
 			{
-				if(!found && sscanf(namelist[n]->d_name,
-						    "0000:%02x:%02x.0",
-						    &my_bus, &my_devfn) == 2)
+				if (*bus >= 0) my_bus = *bus;
+				if (*devfn >= 0) my_devfn = *devfn;
+				if (spec_check_id(my_bus, my_devfn)) 
 				{
-					if (spec_check_id(my_bus, my_devfn)) 
-					{
-						*bus = my_bus;
-						*devfn = my_devfn;
-						found = 1;
-					}
-
+					*bus = my_bus;
+					*devfn = my_devfn;
+					found = 1;
 				}
-				free(namelist[n]);
+
 			}
-			free(namelist);
+			free(namelist[i]);
 		}
-
-	} else {
-		// Check if the requested card is available
-		if (spec_check_id(*bus, *devfn)) 
-			found = 1;
+		free(namelist);
 	}

+
 	if(!found)
 	{
 		fprintf(stderr,"Can't detect any SPEC card :(\n");