Salastil/ckb-next
1
0
Fork 0
mirror of https://github.com/ckb-next/ckb-next.git synced 2026-10-10 12:27:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'frickler24-macrodelay' into testing

Browse Source
This commit is contained in:
Lutz Eichler
2017-06-18 19:38:17 +02:00
parent 1e3715e8e8 4d3f9a40a1
commit 77977cbb40
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ckb-daemon/usb_linux.c
+3 -5
View File
@@ -68,8 +68,7 @@ static char kbsyspath[DEV_MAX][FILENAME_MAX];
int os_usbsend(usbdevice* kb, const uchar* out_msg, int is_recv, const char* file, int line) {
int res;
if (kb->fwversion >= 0x120 && !is_recv) {
struct usbdevfs_bulktransfer transfer;
memset(&transfer, 0, sizeof(transfer));
struct usbdevfs_bulktransfer transfer = {0};
transfer.ep = (kb->fwversion >= 0x130 && kb->fwversion < 0x200) ? 4 : 3;
transfer.len = MSG_SIZE;
transfer.timeout = 5000;
@@ -131,8 +130,7 @@ int os_usbrecv(usbdevice* kb, uchar* in_msg, const char* file, int line){
int res;
// This is what CUE does, but it doesn't seem to work on linux.
/*if(kb->fwversion >= 0x130){
struct usbdevfs_bulktransfer transfer;
memset(&transfer, 0, sizeof(transfer));
struct usbdevfs_bulktransfer transfer = {0};
transfer.ep = 0x84;
transfer.len = MSG_SIZE;
transfer.timeout = 5000;
@@ -565,7 +563,7 @@ int os_setupusb(usbdevice* kb) {
///
const char* ep_str = udev_device_get_sysattr_value(dev, "bNumInterfaces");
#ifdef DEBUG
ckb_info("claiming interfaces. name=%s, serial=%s, firmware=%s; Got >>%s<< as ep_str\n", name, serial, firmware, ep_str);
ckb_info("claiming interfaces. name=%s, firmware=%s; Got >>%s<< as ep_str\n", name, firmware, ep_str);
#endif //DEBUG
kb->epcount = 0;
if(ep_str)