Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

Changed init of structures and removed serialNo from debugmsg #236

Merged
frickler24 merged 1 commit into from
Jun 18, 2017
Merged

Changed init of structures and removed serialNo from debugmsg #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/ckb-daemon/usb_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down