Reduce the AUC timeout, don't read again on P_DETECT pkg

Canaan-Creative · Nov 16, 2014 · fe0c303 · fe0c303
1 parent 8a8f3d5
commit fe0c303
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/driver-avalon4.c b/driver-avalon4.c
@@ -599,7 +599,7 @@ static int avalon4_iic_xfer_pkg(struct cgpu_info *avalon4, uint8_t slave_addr,
 
 	avalon4_iic_init_pkg(wbuf, &iic_info, (uint8_t *)pkg, AVA4_WRITE_SIZE, rlen);
 	err = avalon4_iic_xfer(avalon4, wbuf, wbuf[0], &wcnt, rbuf, rlen, &rcnt);
-	if (err == -7 && rcnt == 0 && rlen) {
+	if ((pkg->type != AVA4_P_DETECT) && err == -7 && !rcnt && rlen) {
 		avalon4_iic_init_pkg(wbuf, &iic_info, NULL, 0, rlen);
 		err = avalon4_iic_xfer(avalon4, wbuf, wbuf[0], &wcnt, rbuf, rlen, &rcnt);
 		applog(LOG_DEBUG, "Avalon4: IIC read again!(err:%d)", err);

diff --git a/usbutils.c b/usbutils.c
@@ -84,6 +84,7 @@ static cgtimer_t usb11_cgt;
 #define BITFORCE_TIMEOUT_MS 200
 #define MODMINER_TIMEOUT_MS 100
 #define AVALON_TIMEOUT_MS 200
+#define AVALON4_TIMEOUT_MS 50
 #define KLONDIKE_TIMEOUT_MS 200
 #define COINTERRA_TIMEOUT_MS 200
 #define HASHFAST_TIMEOUT_MS 500
@@ -643,7 +644,7 @@ static struct usb_find_devices find_dev[] = {
 		.idVendor = 0x29f1,
 		.idProduct = 0x33f2,
 		.config = 1,
-		.timeout = AVALON_TIMEOUT_MS,
+		.timeout = AVALON4_TIMEOUT_MS,
 		.latency = LATENCY_UNUSED,
 		INTINFO(ava4_ints) },
 #endif