Browse Source

avalonmm: Rename avalon2 driver to avoid digits in name (AV2 -> AVM)

Luke Dashjr 12 years ago
parent
commit
8d51aa2700
5 changed files with 9 additions and 9 deletions
  1. 1 1
      Makefile.am
  2. 4 4
      configure.ac
  3. 3 3
      driver-avalonmm.c
  4. 0 0
      driver-avalonmm.h
  5. 1 1
      miner.c

+ 1 - 1
Makefile.am

@@ -278,7 +278,7 @@ bfgminer_SOURCES += driver-klondike.c driver-klondike.h driver-hashbusteravalon.
 endif
 
 if HAS_AVALON2
-bfgminer_SOURCES += driver-avalon2.c driver-avalon2.h
+bfgminer_SOURCES += driver-avalonmm.c driver-avalonmm.h
 endif
 
 if HAS_MODMINER

+ 4 - 4
configure.ac

@@ -556,14 +556,14 @@ fi
 AM_CONDITIONAL([HAS_AVALON], [test x$avalon = xyes])
 
 
-driverlist="$driverlist avalon2"
-AC_ARG_ENABLE([avalon2],
-	[AC_HELP_STRING([--disable-avalon2],[Compile support for Avalon2 (default enabled)])],
+driverlist="$driverlist avalonmm/avalon2"
+AC_ARG_ENABLE([avalonmm],
+	[AC_HELP_STRING([--disable-avalonmm],[Compile support for Avalon2/3 (default enabled)])],
 	[avalon2=$enableval],
 	[avalon2=yes]
 	)
 if test "x$avalon2" = xyes; then
-	AC_DEFINE([USE_AVALON2], [1], [Defined to 1 if Avalon2 support is wanted])
+	AC_DEFINE([USE_AVALON2], [1], [Defined to 1 if Avalon2/3 support is wanted])
 	need_lowl_vcom=yes
 	need_work2d=yes
 	has_asic=yes

+ 3 - 3
driver-avalon2.c → driver-avalonmm.c

@@ -35,7 +35,7 @@
 #include <utlist.h>
 
 #include "miner.h"
-#include "driver-avalon2.h"
+#include "driver-avalonmm.h"
 #include "lowl-vcom.h"
 #include "util.h"
 #include "work2d.h"
@@ -818,8 +818,8 @@ static void avalon2_shutdown(struct thr_info *thr)
 }
 
 struct device_drv avalon2_drv = {
-	.dname = "avalon2",
-	.name = "AV2",
+	.dname = "avalonmm",
+	.name = "AVM",
 	.get_api_stats = avalon2_api_stats,
 	.drv_detect = avalon2_detect,
 	.reinit_device = avalon2_init,

+ 0 - 0
driver-avalon2.h → driver-avalonmm.h


+ 1 - 1
miner.c

@@ -87,7 +87,7 @@
 #endif
 
 #ifdef USE_AVALON2
-#include "driver-avalon2.h"
+#include "driver-avalonmm.h"
 #endif
 
 #ifdef HAVE_BFG_LOWLEVEL