Browse Source

CMR usb config guess

Kano 12 years ago
parent
commit
511bbb050c
2 changed files with 3 additions and 4 deletions
  1. 1 2
      driver-icarus.c
  2. 2 2
      usbutils.c

+ 1 - 2
driver-icarus.c

@@ -253,6 +253,7 @@ static void icarus_initialise(struct cgpu_info *icarus, __maybe_unused int baud)
 	switch (icarus->usbdev->ident) {
 	switch (icarus->usbdev->ident) {
 		case IDENT_BLT:
 		case IDENT_BLT:
 		case IDENT_LLT:
 		case IDENT_LLT:
+		case IDENT_CMR:
 			// Latency
 			// Latency
 			transfer(icarus, FTDI_TYPE_OUT, FTDI_REQUEST_LATENCY, FTDI_VALUE_LATENCY,
 			transfer(icarus, FTDI_TYPE_OUT, FTDI_REQUEST_LATENCY, FTDI_VALUE_LATENCY,
 				 icarus->usbdev->found->interface, C_LATENCY);
 				 icarus->usbdev->found->interface, C_LATENCY);
@@ -344,8 +345,6 @@ static void icarus_initialise(struct cgpu_info *icarus, __maybe_unused int baud)
 				 icarus->usbdev->found->interface,
 				 icarus->usbdev->found->interface,
 				 &data, sizeof(data), C_SETBAUD);
 				 &data, sizeof(data), C_SETBAUD);
 
 
-			break;
-		case IDENT_CMR:
 			break;
 			break;
 		default:
 		default:
 			quit(1, "icarus_intialise() called with invalid %s cgid %i ident=%d",
 			quit(1, "icarus_intialise() called with invalid %s cgid %i ident=%d",

+ 2 - 2
usbutils.c

@@ -231,8 +231,8 @@ static struct usb_find_devices find_dev[] = {
 		.drv = DRV_ICARUS,
 		.drv = DRV_ICARUS,
 		.name = "CMR",
 		.name = "CMR",
 		.ident = IDENT_CMR,
 		.ident = IDENT_CMR,
-		.idVendor = 0x067b,
-		.idProduct = 0x0230,
+		.idVendor = IDVENDOR_FTDI,
+		.idProduct = 0x8350,
 		.iProduct = "Cairnsmore1",
 		.iProduct = "Cairnsmore1",
 		.kernel = 0,
 		.kernel = 0,
 		.config = 1,
 		.config = 1,