In article <[EMAIL PROTECTED]> you wrote:
> n_hibma     2000/10/16 11:14:00 PDT
> 
>   Modified files:
>     lib/libusb           descr.c libusb.h parse.c usage.c usb.3 
>   Log:
>   Sync with NetBSD:
>   
>   K&R -> ANSI
>   
>   Bugfix: 'Keep the bit position even when the report descriptor says POP.'
>   
>   Add hid_use_report_desc, hid_parse_usage_page, hid_parse_usage_in_page.
>   
>   Changed iface for hid_report_size.

        The last part breaks building of 'usr.bin/usbhidctl'.
The next patch make it possible to build (but I have no means
to test if it is working at all).

        N.Dudorov
================================================================
   
Index: usr.bin/usbhidctl/usbhid.c
===================================================================
RCS file: /scratch/CVS/src/usr.bin/usbhidctl/usbhid.c,v
retrieving revision 1.2
diff -b -u -r1.2 usbhid.c
--- usr.bin/usbhidctl/usbhid.c  2000/10/09 05:44:39     1.2
+++ usr.bin/usbhidctl/usbhid.c  2000/10/17 05:31:39
@@ -147,17 +147,17 @@
                }
        }
        hid_end_parse(d);
-       size = hid_report_size(r, hid_input, &report_id);
+       size = hid_report_size(r, report_id, hid_input);
        size -= report_id != 0;
        printf("Total   input size %s%d bytes\n", 
               report_id && size ? "1+" : "", size);
               
-       size = hid_report_size(r, hid_output, &report_id);
+       size = hid_report_size(r, report_id, hid_output);
        size -= report_id != 0;
        printf("Total  output size %s%d bytes\n",
               report_id && size ? "1+" : "", size);
 
-       size = hid_report_size(r, hid_feature, &report_id);
+       size = hid_report_size(r, report_id, hid_feature);
        size -= report_id != 0;
        printf("Total feature size %s%d bytes\n",
               report_id && size ? "1+" : "", size);
@@ -225,7 +225,7 @@
        }
        hid_end_parse(d);
        rev(&hids);
-       dlen = hid_report_size(rd, hid_input, &report_id);
+       dlen = hid_report_size(rd, report_id, hid_input);
        dbuf = malloc(dlen);
        if (!loop)
                if (ioctl(f, USB_SET_IMMED, &one) < 0) {


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message

Reply via email to