Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/uhidev.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/uhidev.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- src/sys/dev/usb/uhidev.c 2002/02/27 01:30:50 1.5 +++ src/sys/dev/usb/uhidev.c 2002/07/11 21:14:29 1.6 @@ -1,4 +1,4 @@ -/* $NetBSD: uhidev.c,v 1.5 2002/02/27 01:30:50 augustss Exp $ */ +/* $NetBSD: uhidev.c,v 1.6 2002/07/11 21:14:29 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -85,7 +85,7 @@ USB_MATCH(uhidev) { USB_MATCH_START(uhidev, uaa); usb_interface_descriptor_t *id; - + if (uaa->iface == NULL) return (UMATCH_NONE); id = usbd_get_interface_descriptor(uaa->iface); @@ -111,7 +111,7 @@ USB_ATTACH(uhidev) void *desc; usbd_status err; char devinfo[1024]; - + sc->sc_udev = uaa->device; sc->sc_iface = iface; id = usbd_get_interface_descriptor(iface); @@ -140,7 +140,7 @@ USB_ATTACH(uhidev) DPRINTFN(10,("uhidev_attach: bLength=%d bDescriptorType=%d " "bEndpointAddress=%d-%s bmAttributes=%d wMaxPacketSize=%d" " bInterval=%d\n", - ed->bLength, ed->bDescriptorType, + ed->bLength, ed->bDescriptorType, ed->bEndpointAddress & UE_ADDR, UE_GET_DIR(ed->bEndpointAddress)==UE_DIR_IN? "in" : "out", ed->bmAttributes & UE_XFERTYPE, @@ -177,7 +177,7 @@ USB_ATTACH(uhidev) sc->sc_dying = 1; USB_ATTACH_ERROR_RETURN; } - + sc->sc_repdesc = desc; sc->sc_repdesc_size = size; @@ -350,7 +350,7 @@ uhidev_intr(usbd_xfer_handle xfer, usbd_ #ifdef UHIDEV_DEBUG if (uhidevdebug > 5) { u_int32_t i; - + DPRINTF(("uhidev_intr: status=%d cc=%d\n", status, cc)); DPRINTF(("uhidev_intr: data =")); for (i = 0; i < cc; i++) @@ -421,8 +421,8 @@ uhidev_open(struct uhidev *scd) /* Set up interrupt pipe. */ DPRINTF(("uhidev_open: isize=%d, ep=0x%02x\n", sc->sc_isize, sc->sc_ep_addr)); - err = usbd_open_pipe_intr(sc->sc_iface, sc->sc_ep_addr, - USBD_SHORT_XFER_OK, &sc->sc_intrpipe, sc, sc->sc_ibuf, + err = usbd_open_pipe_intr(sc->sc_iface, sc->sc_ep_addr, + USBD_SHORT_XFER_OK, &sc->sc_intrpipe, sc, sc->sc_ibuf, sc->sc_isize, uhidev_intr, USBD_DEFAULT_INTERVAL); if (err) { DPRINTF(("uhidopen: usbd_open_pipe_intr failed, " @@ -473,7 +473,7 @@ uhidev_set_report(struct uhidev *scd, in data = buf; } - return usbd_set_report(scd->sc_parent->sc_iface, type, + return usbd_set_report(scd->sc_parent->sc_iface, type, scd->sc_report_id, data, len); } @@ -489,13 +489,13 @@ uhidev_set_report_async(struct uhidev *s data = buf; } - usbd_set_report_async(scd->sc_parent->sc_iface, type, + usbd_set_report_async(scd->sc_parent->sc_iface, type, scd->sc_report_id, data, len); } usbd_status uhidev_get_report(struct uhidev *scd, int type, void *data, int len) { - return usbd_get_report(scd->sc_parent->sc_iface, type, + return usbd_get_report(scd->sc_parent->sc_iface, type, scd->sc_report_id, data, len); }