Revert hacks in 84965f4d345ecbdb91d7a70e1ed47f902f44fd9d (partial)

driver-modminer.c

@@ -232,6 +232,22 @@ modminer_device_prepare(struct cgpu_info *modminer)
 
 #undef bailout
 
+struct modminer_fpga_state {
+	bool work_running;
+	struct work running_work;
+	struct timeval tv_workstart;
+	uint32_t hashes;
+
+	char next_work_cmd[46];
+
+	unsigned char clock;
+	int no_nonce_counter;
+	int good_share_counter;
+	time_t last_cutoff_reduced;
+
+	unsigned char temp;
+};
+
 static bool
 modminer_fpga_prepare(struct thr_info *thr)
 {

miner.h

@@ -741,24 +741,6 @@ struct work {
 	time_t share_found_time;
 };
 
-#ifdef USE_MODMINER 
-struct modminer_fpga_state {
-	bool work_running;
-	struct work running_work;
-	struct timeval tv_workstart;
-	uint32_t hashes;
-
-	char next_work_cmd[46];
-
-	unsigned char clock;
-	int no_nonce_counter;
-	int good_share_counter;
-	time_t last_cutoff_reduced;
-
-	unsigned char temp;
-};
-#endif
-
 extern void get_datestamp(char *, struct timeval *);
 extern bool test_nonce(struct work *work, uint32_t nonce);
 bool submit_nonce(struct thr_info *thr, struct work *work, uint32_t nonce);