Browse Source

Merge branch 'uniscan2' into bfgminer

Luke Dashjr 12 years ago
parent
commit
0f904ab938
2 changed files with 6 additions and 7 deletions
  1. 1 0
      lowlevel.c
  2. 5 7
      miner.c

+ 1 - 0
lowlevel.c

@@ -135,6 +135,7 @@ struct lowlevel_device_info *lowlevel_scan()
 		       (unsigned)devinfo_mid_list->vid, (unsigned)devinfo_mid_list->pid,
 		       (unsigned)devinfo_mid_list->vid, (unsigned)devinfo_mid_list->pid,
 		       devinfo_mid_list->manufacturer, devinfo_mid_list->product, devinfo_mid_list->serial);
 		       devinfo_mid_list->manufacturer, devinfo_mid_list->product, devinfo_mid_list->serial);
 	}
 	}
+	HASH_CLEAR(hh, devinfo_same_prev_ht);
 	
 	
 	return devinfo_list;
 	return devinfo_list;
 }
 }

+ 5 - 7
miner.c

@@ -502,14 +502,12 @@ static void applog_and_exit(const char *fmt, ...)
 char *devpath_to_devid(const char *devpath)
 char *devpath_to_devid(const char *devpath)
 {
 {
 #ifndef WIN32
 #ifndef WIN32
+	struct stat my_stat;
+	if (stat(devpath, &my_stat))
+		return NULL;
 	char *devs = malloc(6 + (sizeof(dev_t) * 2) + 1);
 	char *devs = malloc(6 + (sizeof(dev_t) * 2) + 1);
-	{
-		struct stat my_stat;
-		if (stat(devpath, &my_stat))
-			return NULL;
-		memcpy(devs, "dev_t:", 6);
-		bin2hex(&devs[6], &my_stat.st_rdev, sizeof(dev_t));
-	}
+	memcpy(devs, "dev_t:", 6);
+	bin2hex(&devs[6], &my_stat.st_rdev, sizeof(dev_t));
 #else
 #else
 	if (!strncmp(devpath, "\\\\.\\", 4))
 	if (!strncmp(devpath, "\\\\.\\", 4))
 		devpath += 4;
 		devpath += 4;