Browse Source

more AVALON defines

Xiangfu 13 years ago
parent
commit
e2cb58d4ff
3 changed files with 42 additions and 2 deletions
  1. 16 1
      api.c
  2. 13 1
      cgminer.c
  3. 13 0
      usbutils.c

+ 16 - 1
api.c

@@ -29,7 +29,7 @@
 #include "util.h"
 #include "driver-cpu.h" /* for algo_names[], TODO: re-factor dependency */
 
-#if defined(USE_BITFORCE) || defined(USE_ICARUS) || defined(USE_ZTEX) || defined(USE_MODMINER)
+#if defined(USE_BITFORCE) || defined(USE_ICARUS) || defined(USE_AVALON) || defined(USE_ZTEX) || defined(USE_MODMINER)
 #define HAVE_AN_FPGA 1
 #endif
 
@@ -171,6 +171,9 @@ static const char *DEVICECODE = ""
 #ifdef USE_ICARUS
 			"ICA "
 #endif
+#ifdef USE_AVALON
+			"AVA "
+#endif
 #ifdef USE_ZTEX
 			"ZTX "
 #endif
@@ -607,6 +610,10 @@ extern struct device_api bitforce_api;
 extern struct device_api icarus_api;
 #endif
 
+#ifdef USE_AVALON
+extern struct device_api avalon_api;
+#endif
+
 #ifdef USE_ZTEX
 extern struct device_api ztex_api;
 #endif
@@ -1160,6 +1167,10 @@ static int numpgas()
 		if (devices[i]->api == &icarus_api)
 			count++;
 #endif
+#ifdef USE_AVALON
+		if (devices[i]->api == &avalon_api)
+			count++;
+#endif
 #ifdef USE_ZTEX
 		if (devices[i]->api == &ztex_api)
 			count++;
@@ -1186,6 +1197,10 @@ static int pgadevice(int pgaid)
 		if (devices[i]->api == &icarus_api)
 			count++;
 #endif
+#ifdef USE_AVALON
+		if (devices[i]->api == &avalon_api)
+			count++;
+#endif
 #ifdef USE_ZTEX
 		if (devices[i]->api == &ztex_api)
 			count++;

+ 13 - 1
cgminer.c

@@ -55,7 +55,7 @@
 	#include <sys/wait.h>
 #endif
 
-#if defined(USE_BITFORCE) || defined(USE_ICARUS) || defined(USE_MODMINER)
+#if defined(USE_BITFORCE) || defined(USE_ICARUS) || defined(USE_AVALON) || defined(USE_MODMINER)
 #	define USE_FPGA
 #	define USE_FPGA_SERIAL
 #elif defined(USE_ZTEX)
@@ -1275,6 +1275,9 @@ static char *opt_verusage_and_exit(const char *extra)
 #ifdef USE_ICARUS
 		"icarus "
 #endif
+#ifdef USE_AVALON
+		"avalon "
+#endif
 #ifdef USE_MODMINER
 		"modminer "
 #endif
@@ -6308,6 +6311,10 @@ extern struct device_api bitforce_api;
 extern struct device_api icarus_api;
 #endif
 
+#ifdef USE_AVALON
+extern struct device_api avalon_api;
+#endif
+
 #ifdef USE_MODMINER
 extern struct device_api modminer_api;
 #endif
@@ -6577,6 +6584,11 @@ int main(int argc, char *argv[])
 		icarus_api.api_detect();
 #endif
 
+#ifdef USE_AVALON
+	if (!opt_scrypt)
+		avalon_api.api_detect();
+#endif
+
 #ifdef USE_BITFORCE
 	if (!opt_scrypt)
 		bitforce_api.api_detect();

+ 13 - 0
usbutils.c

@@ -20,6 +20,10 @@
 #define DRV_ICARUS 1
 #endif
 
+#ifdef USE_AVALON
+#define DRV_AVALON 1
+#endif
+
 #ifdef USE_BITFORCE
 #define DRV_BITFORCE 2
 #endif
@@ -83,6 +87,10 @@ extern struct device_api bitforce_api;
 extern struct device_api icarus_api;
 #endif
 
+#ifdef USE_AVALON
+extern struct device_api avalon_api;
+#endif
+
 #ifdef USE_MODMINER
 extern struct device_api modminer_api;
 #endif
@@ -912,6 +920,11 @@ static struct usb_find_devices *usb_check(__maybe_unused struct device_api *api,
 		return usb_check_each(DRV_ICARUS, api, dev);
 #endif
 
+#ifdef USE_AVALON
+	if (api == &avalon_api)
+		return usb_check_each(DRV_AVALON, api, dev);
+#endif
+
 #ifdef USE_MODMINER
 	if (api == &modminer_api)
 		return usb_check_each(DRV_MODMINER, api, dev);