Commit 1ef38f82e8a507261701e755405474bf0db562dc
2013-09-29T12:28:43
Separate out asic fpga and opencl drivers in the driver parse commands macro for use individually as needed.
diff --git a/miner.h b/miner.h
index cdd41ad..42f9743 100644
--- a/miner.h
+++ b/miner.h
@@ -231,17 +231,25 @@ static inline int fsync (int fd)
#define MAX(x, y) ((x) > (y) ? (x) : (y))
/* Put avalon last to make it the last device it tries to detect to prevent it
- * trying to claim same chip but different devices. */
-#define DRIVER_PARSE_COMMANDS \
- DRIVER_ADD_COMMAND(bflsc) \
+ * trying to claim same chip but different devices. Adding a device here will
+ * update all macros in the code that use the *_PARSE_COMMANDS macros for each
+ * listed driver. */
+#define FPGA_PARSE_COMMANDS \
DRIVER_ADD_COMMAND(bitforce) \
- DRIVER_ADD_COMMAND(bitfury) \
DRIVER_ADD_COMMAND(icarus) \
DRIVER_ADD_COMMAND(modminer) \
- DRIVER_ADD_COMMAND(opencl) \
- DRIVER_ADD_COMMAND(ztex) \
+ DRIVER_ADD_COMMAND(ztex)
+
+#define ASIC_PARSE_COMMANDS \
+ DRIVER_ADD_COMMAND(bflsc) \
+ DRIVER_ADD_COMMAND(bitfury) \
DRIVER_ADD_COMMAND(avalon)
+#define DRIVER_PARSE_COMMANDS \
+ DRIVER_ADD_COMMAND(opencl) \
+ FPGA_PARSE_COMMANDS \
+ ASIC_PARSE_COMMANDS
+
/* Create drv_driver enum from DRIVER_PARSE_COMMANDS macro */
#define DRIVER_ADD_COMMAND(X) DRIVER_##X,
enum drv_driver {