Merge commit '90db787' into bfgminer

70-bfgminer.rules.in

@@ -9,6 +9,7 @@ LABEL="bfgminer_start"
 @USE_BITFORCE_TRUE@ENV{ID_MODEL}=="*BitFORCE*SHA256*", GOTO="bfgminer_add"
 @USE_COINTERRA_TRUE@ENV{ID_MODEL}=="*GoldStrike*", GOTO="bfgminer_add"
 @USE_DRILLBIT_TRUE@ENV{manufacturer}=="*Drillbit*", GOTO="bfgminer_add"
+@USE_ICARUS_TRUE@ENV{ID_MODEL}=="*Antminer*", GOTO="bfgminer_add"
 @USE_ICARUS_TRUE@ENV{ID_MODEL}=="*Cairnsmore1*", GOTO="bfgminer_add"
 @USE_ICARUS_TRUE@ENV{ID_MODEL}=="*Block*Erupter*", GOTO="bfgminer_add"
 @USE_HASHBUSTER_TRUE@ENV{ID_MODEL}=="*HashBuster*", GOTO="bfgminer_add"

driver-antminer.c

@@ -72,6 +72,12 @@ bool antminer_detect_one(const char *devpath)
 	return true;
 }
 
+static
+bool antminer_lowl_match(const struct lowlevel_device_info * const info)
+{
+	return lowlevel_match_lowlproduct(info, &lowl_vcom, "Antminer");
+}
+
 static
 bool antminer_lowl_probe(const struct lowlevel_device_info * const info)
 {
@@ -270,6 +276,7 @@ void antminer_drv_init()
 	antminer_drv = icarus_drv;
 	antminer_drv.dname = "antminer";
 	antminer_drv.name = "AMU";
+	antminer_drv.lowl_match = antminer_lowl_match;
 	antminer_drv.lowl_probe = antminer_lowl_probe;
 	antminer_drv.identify_device = antminer_identify;
 	++antminer_drv.probe_priority;