(ckb-daemon) EP for transfers should be FW-dependent, not device-dependent

ccMSC · ccMSC · commit dfc2fab6ff05 · 2016-04-26T02:18:01.000-06:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-beta-v0.2.5+f02
+beta-v0.2.5+f03
diff --git a/src/ckb-daemon/usb_linux.c b/src/ckb-daemon/usb_linux.c
@@ -13,7 +13,7 @@ int os_usbsend(usbdevice* kb, const uchar* out_msg, int is_recv, const char* fil
     if(kb->fwversion >= 0x120 && !is_recv){
         struct usbdevfs_bulktransfer transfer;
         memset(&transfer, 0, sizeof(transfer));
-        transfer.ep = (kb->fwversion >= 0x130 && !IS_MOUSE_DEV(kb)) ? 4 : 3;
+        transfer.ep = (kb->fwversion >= 0x130 && kb->fwversion < 0x200) ? 4 : 3;
         transfer.len = MSG_SIZE;
         transfer.timeout = 5000;
         transfer.data = (void*)out_msg;
diff --git a/src/ckb-daemon/usb_mac.c b/src/ckb-daemon/usb_mac.c
@@ -96,7 +96,7 @@ int os_usbsend(usbdevice* kb, const uchar* out_msg, int is_recv, const char* fil
         }
     } else {
         // For newer devices, use interrupt transfers
-        int ep = (kb->fwversion >= 0x130 && !IS_MOUSE_DEV(kb)) ? 4 : 3;
+        int ep = (kb->fwversion >= 0x130 && kb->fwversion < 0x200) ? 4 : 3;
         usb_iface_t h_usb = kb->ifusb[ep - 1];
         hid_dev_t h_hid = kb->ifhid[ep - 1];
         if(h_usb)

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ int os_usbsend(usbdevice* kb, const uchar* out_msg, int is_recv, const char* fil`
`96`	`96`	`}`
`97`	`97`	`} else {`
`98`	`98`	`// For newer devices, use interrupt transfers`
`99`		`- int ep = (kb->fwversion >= 0x130 && !IS_MOUSE_DEV(kb)) ? 4 : 3;`
	`99`	`+ int ep = (kb->fwversion >= 0x130 && kb->fwversion < 0x200) ? 4 : 3;`
`100`	`100`	`usb_iface_t h_usb = kb->ifusb[ep - 1];`
`101`	`101`	`hid_dev_t h_hid = kb->ifhid[ep - 1];`
`102`	`102`	`if(h_usb)`