[BACK]Return to usbdi_util.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / dev / usb

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/dev/usb/usbdi_util.c between version 1.33.4.1 and 1.33.4.2

version 1.33.4.1, 2001/08/24 00:11:15 version 1.33.4.2, 2001/11/14 19:16:23
Line 38 
Line 38 
  * POSSIBILITY OF SUCH DAMAGE.   * POSSIBILITY OF SUCH DAMAGE.
  */   */
   
   #include <sys/cdefs.h>
   __KERNEL_RCSID(0, "$NetBSD$");
   
 #include <sys/param.h>  #include <sys/param.h>
 #include <sys/systm.h>  #include <sys/systm.h>
 #include <sys/kernel.h>  #include <sys/kernel.h>
Line 335  usbd_set_idle(usbd_interface_handle ifac
Line 338  usbd_set_idle(usbd_interface_handle ifac
 }  }
   
 usbd_status  usbd_status
 usbd_get_report_descriptor(usbd_device_handle dev, int ifcno, int repid,  usbd_get_report_descriptor(usbd_device_handle dev, int ifcno,
                            int size, void *d)                             int size, void *d)
 {  {
         usb_device_request_t req;          usb_device_request_t req;
   
         req.bmRequestType = UT_READ_INTERFACE;          req.bmRequestType = UT_READ_INTERFACE;
         req.bRequest = UR_GET_DESCRIPTOR;          req.bRequest = UR_GET_DESCRIPTOR;
         USETW2(req.wValue, UDESC_REPORT, repid);          USETW2(req.wValue, UDESC_REPORT, 0); /* report id should be 0 */
         USETW(req.wIndex, ifcno);          USETW(req.wIndex, ifcno);
         USETW(req.wLength, size);          USETW(req.wLength, size);
         return (usbd_do_request(dev, &req, d));          return (usbd_do_request(dev, &req, d));
Line 379  usbd_get_hid_descriptor(usbd_interface_h
Line 382  usbd_get_hid_descriptor(usbd_interface_h
 }  }
   
 usbd_status  usbd_status
 usbd_alloc_report_desc(usbd_interface_handle ifc, void **descp, int *sizep,  usbd_read_report_desc(usbd_interface_handle ifc, void **descp, int *sizep,
                        usb_malloc_type mem)                         usb_malloc_type mem)
 {  {
         usb_interface_descriptor_t *id;          usb_interface_descriptor_t *id;
Line 400  usbd_alloc_report_desc(usbd_interface_ha
Line 403  usbd_alloc_report_desc(usbd_interface_ha
         *descp = malloc(*sizep, mem, M_NOWAIT);          *descp = malloc(*sizep, mem, M_NOWAIT);
         if (*descp == NULL)          if (*descp == NULL)
                 return (USBD_NOMEM);                  return (USBD_NOMEM);
         /* XXX should not use 0 Report ID */          err = usbd_get_report_descriptor(dev, id->bInterfaceNumber,
         err = usbd_get_report_descriptor(dev, id->bInterfaceNumber, 0,                                           *sizep, *descp);
                                        *sizep, *descp);  
         if (err) {          if (err) {
                 free(*descp, mem);                  free(*descp, mem);
                 *descp = NULL;                  *descp = NULL;
Legend:
Removed from v.1.33.4.1  
changed lines
  Added in v.1.33.4.2
CVSweb <webmaster@jp.NetBSD.org>