BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testo: Detach kernel driver as needed, and code optimization. 

Thanks to Aurelien Jacobs for the CRC check code improvement.
This commit is contained in:
Bert Vermeulen 2014-07-07 17:37:36 +02:00
parent 8789564070
commit 88b1d4e573
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hardware/testo/api.c
View File

@ -186,6 +186,16 @@ static int dev_open(struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
} }
if (libusb_has_capability(LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER)) {
if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
if ((ret = libusb_detach_kernel_driver(usb->devhdl, 0)) < 0) {
sr_err("Failed to detach kernel driver: %s.",
libusb_error_name(ret));
return SR_ERR;
}
}
}
if ((ret = libusb_claim_interface(usb->devhdl, 0))) { if ((ret = libusb_claim_interface(usb->devhdl, 0))) {
sr_err("Failed to claim interface: %s.", libusb_error_name(ret)); sr_err("Failed to claim interface: %s.", libusb_error_name(ret));
return SR_ERR; return SR_ERR;
@ -345,8 +355,7 @@ static void receive_data(struct sr_dev_inst *sdi, unsigned char *data, int len)
return; return;
crc = crc16_mcrf4xx(0xffff, devc->reply, devc->reply_size - 2); crc = crc16_mcrf4xx(0xffff, devc->reply, devc->reply_size - 2);
if ((crc & 0xff) == devc->reply[devc->reply_size - 2] if (crc == RL16(&devc->reply[devc->reply_size - 2])) {
&& (crc >> 8) == devc->reply[devc->reply_size - 1]) {
testo_receive_packet(sdi); testo_receive_packet(sdi);
devc->num_samples++; devc->num_samples++;
} else { } else {