rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Raw HID plugin: clean up debug output so that at least it does not use multiple lines.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2315 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2011-01-01 20:41:43 +00:00 committed by edouard
parent c01676eed2
commit 0a554f79da
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ground/src/plugins/rawhid/pjrc_rawhid_unix.cpp
View File

@ -104,7 +104,7 @@ int pjrc_rawhid::open(int max, int vid, int pid, int usage_page, int usage)
if (pid > 0 && dev->descriptor.idProduct != pid) continue; if (pid > 0 && dev->descriptor.idProduct != pid) continue;
if (!dev->config) continue; if (!dev->config) continue;
if (dev->config->bNumInterfaces < 1) continue; if (dev->config->bNumInterfaces < 1) continue;
printf("device: vid=%04X, pic=%04X, with %d iface\n", printf("device: vid=%04X, pic=%04X, with %d iface",
dev->descriptor.idVendor, dev->descriptor.idVendor,
dev->descriptor.idProduct, dev->descriptor.idProduct,
dev->config->bNumInterfaces); dev->config->bNumInterfaces);
@ -114,7 +114,7 @@ int pjrc_rawhid::open(int max, int vid, int pid, int usage_page, int usage)
for (i=0; i<dev->config->bNumInterfaces && iface; i++, iface++) { for (i=0; i<dev->config->bNumInterfaces && iface; i++, iface++) {
desc = iface->altsetting; desc = iface->altsetting;
if (!desc) continue; if (!desc) continue;
printf(" type %d, %d, %d\n", desc->bInterfaceClass, printf(" type %d, %d, %d", desc->bInterfaceClass,
desc->bInterfaceSubClass, desc->bInterfaceProtocol); desc->bInterfaceSubClass, desc->bInterfaceProtocol);
if (desc->bInterfaceClass != 3) continue; if (desc->bInterfaceClass != 3) continue;
if (desc->bInterfaceSubClass != 0) continue; if (desc->bInterfaceSubClass != 0) continue;
@ -124,34 +124,34 @@ int pjrc_rawhid::open(int max, int vid, int pid, int usage_page, int usage)
for (n = 0; n < desc->bNumEndpoints; n++, ep++) { for (n = 0; n < desc->bNumEndpoints; n++, ep++) {
if (ep->bEndpointAddress & 0x80) { if (ep->bEndpointAddress & 0x80) {
if (!ep_in) ep_in = ep->bEndpointAddress & 0x7F; if (!ep_in) ep_in = ep->bEndpointAddress & 0x7F;
printf(" IN endpoint %d\n", ep_in); qDebug() << " IN endpoint " << ep_in;
} else { } else {
if (!ep_out) ep_out = ep->bEndpointAddress; if (!ep_out) ep_out = ep->bEndpointAddress;
printf(" OUT endpoint %d\n", ep_out); qDebug() << " OUT endpoint " << ep_out;
} }
} }
if (!ep_in) continue; if (!ep_in) continue;
if (!u) { if (!u) {
u = usb_open(dev); u = usb_open(dev);
if (!u) { if (!u) {
printf(" unable to open device\n"); qDebug() << " unable to open device";
break; break;
} }
} }
printf(" hid interface (generic)\n"); qDebug() << " hid interface (generic)";
if (usb_get_driver_np(u, i, (char *)buf, sizeof(buf)) >= 0) { if (usb_get_driver_np(u, i, (char *)buf, sizeof(buf)) >= 0) {
printf(" in use by driver \"%s\"\n", buf); printf(" in use by driver \"%s\"", buf);
if (usb_detach_kernel_driver_np(u, i) < 0) { if (usb_detach_kernel_driver_np(u, i) < 0) {
printf(" unable to detach from kernel\n"); printf(" unable to detach from kernel");
continue; continue;
} }
} }
if (usb_claim_interface(u, i) < 0) { if (usb_claim_interface(u, i) < 0) {
printf(" unable claim interface %d\n", i); printf(" unable claim interface %d", i);
continue; continue;
} }
len = usb_control_msg(u, 0x81, 6, 0x2200, i, (char *)buf, sizeof(buf), 250); len = usb_control_msg(u, 0x81, 6, 0x2200, i, (char *)buf, sizeof(buf), 250);
printf(" descriptor, len=%d\n", len); printf(" descriptor, len=%d", len);
if (len < 2) { if (len < 2) {
usb_release_interface(u, i); usb_release_interface(u, i);
continue; continue;
@ -159,7 +159,7 @@ int pjrc_rawhid::open(int max, int vid, int pid, int usage_page, int usage)
p = buf; p = buf;
parsed_usage_page = parsed_usage = 0; parsed_usage_page = parsed_usage = 0;
while ((tag = hid_parse_item(&val, &p, buf + len)) >= 0) { while ((tag = hid_parse_item(&val, &p, buf + len)) >= 0) {
printf(" tag: %X, val %X\n", tag, val); printf(" tag: %X, val %X", tag, val);
if (tag == 4) parsed_usage_page = val; if (tag == 4) parsed_usage_page = val;
if (tag == 8) parsed_usage = val; if (tag == 8) parsed_usage = val;
if (parsed_usage_page && parsed_usage) break; if (parsed_usage_page && parsed_usage) break;