Diff for /src/sys/bus/usb/usbdi_util.h between versions 1.2 and 1.3

version 1.2, 2003/06/17 04:28:32 version 1.3, 2003/12/30 01:01:44
Line 1 Line 1
/*        $NetBSD: usbdi_util.h,v 1.17 1999/09/05 19:32:19 augustss Exp $ *//*
/*        $FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.9.2.2 2000/10/31 23:23:30 n_hibma Exp $  */ * $NetBSD: usbdi_util.h,v 1.23 2001/10/26 17:58:22 augustss Exp $
/*        $DragonFly: src/sys/dev/usb/usbdi_util.h,v 1.1 2003/06/16 06:11:33 dillon Exp $   */ * $FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.16 2003/07/04 01:50:39 jmg Exp $
  * $DragonFly$
  */
   
 /*  /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.   * Copyright (c) 1998 The NetBSD Foundation, Inc.
Line 39 Line 41
  * POSSIBILITY OF SUCH DAMAGE.   * POSSIBILITY OF SUCH DAMAGE.
  */   */
   
usbd_status     usbd_get_desc(usbd_device_handle dev, int type, usbd_status     usbd_get_desc(usbd_device_handle dev, int type,
                                   int index, int len, void *desc);                              int index, int len, void *desc);
usbd_status     usbd_get_config_desc(usbd_device_handle, int, usbd_status     usbd_get_config_desc(usbd_device_handle, int,
                                          usb_config_descriptor_t *);                                     usb_config_descriptor_t *);
usbd_status     usbd_get_config_desc_full(usbd_device_handle, int, usbd_status     usbd_get_config_desc_full(usbd_device_handle, int, void *, int);
                                               void *, int); 
 usbd_status     usbd_get_device_desc(usbd_device_handle dev,  usbd_status     usbd_get_device_desc(usbd_device_handle dev,
                                          usb_device_descriptor_t *d);                                     usb_device_descriptor_t *d);
 usbd_status     usbd_set_address(usbd_device_handle dev, int addr);  usbd_status     usbd_set_address(usbd_device_handle dev, int addr);
usbd_status     usbd_get_port_status(usbd_device_handle, usbd_status     usbd_get_port_status(usbd_device_handle,
                                      int, usb_port_status_t *);                                     int, usb_port_status_t *);
 usbd_status     usbd_set_hub_feature(usbd_device_handle dev, int);  usbd_status     usbd_set_hub_feature(usbd_device_handle dev, int);
 usbd_status     usbd_clear_hub_feature(usbd_device_handle, int);  usbd_status     usbd_clear_hub_feature(usbd_device_handle, int);
 usbd_status     usbd_set_port_feature(usbd_device_handle dev, int, int);  usbd_status     usbd_set_port_feature(usbd_device_handle dev, int, int);
 usbd_status     usbd_clear_port_feature(usbd_device_handle, int, int);  usbd_status     usbd_clear_port_feature(usbd_device_handle, int, int);
usbd_status     usbd_get_device_status(usbd_device_handle,usb_status_t*);usbd_status     usbd_get_device_status(usbd_device_handle, usb_status_t *);
usbd_status     usbd_get_hub_status(usbd_device_handle dev,usbd_status     usbd_get_hub_status(usbd_device_handle, usb_hub_status_t *);
                                         usb_hub_status_t *st); 
 usbd_status     usbd_set_protocol(usbd_interface_handle dev, int report);  usbd_status     usbd_set_protocol(usbd_interface_handle dev, int report);
usbd_status     usbd_get_report_descriptorusbd_status     usbd_get_report_descriptor(usbd_device_handle dev, int ifcno,
        (usbd_device_handle dev, int ifcno, int repid, int size, void *d);                                           int size, void *d);
struct usb_hid_descriptor *usbd_get_hid_descriptor struct usb_hid_descriptor *usbd_get_hid_descriptor(usbd_interface_handle ifc);
        (usbd_interface_handle ifc);usbd_status     usbd_set_report(usbd_interface_handle iface, int type, int id,
usbd_status     usbd_set_report                                 void *data,int len);
        (usbd_interface_handle iface,int type,int id,void *data,int len);usbd_status     usbd_set_report_async(usbd_interface_handle iface, int type,
usbd_status     usbd_set_report_async                                      int id, void *data, int len);
        (usbd_interface_handle iface,int type,int id,void *data,int len);usbd_status     usbd_get_report(usbd_interface_handle iface, int type, int id,
usbd_status     usbd_get_report                                 void *data, int len);
        (usbd_interface_handle iface,int type,int id,void *data,int len);usbd_status     usbd_set_idle(usbd_interface_handle iface, int duration, int id);
usbd_status     usbd_set_idle usbd_status     usbd_read_report_desc(usbd_interface_handle ifc, void **descp,
        (usbd_interface_handle iface, int duration, int id);                                      int *sizep, usb_malloc_type mem);
#if defined(__NetBSD__) || defined(__OpenBSD__)usbd_status     usbd_get_config(usbd_device_handle dev, u_int8_t *conf);
usbd_status     usbd_alloc_report_descusbd_status     usbd_get_string_desc(usbd_device_handle dev, int sindex,
        (usbd_interface_handle ifc, void **descp, int *sizep, int mem);                                     int langid, usb_string_descriptor_t *sdesc);
#elif defined(__FreeBSD__)void            usbd_delay_ms(usbd_device_handle, u_int);
usbd_status     usbd_alloc_report_desc
        (usbd_interface_handle ifc, void **descp, int *sizep, struct malloc_type * mem);
#endifusbd_status usbd_set_config_no(usbd_device_handle dev, int no, int msg);
usbd_status     usbd_get_configusbd_status usbd_set_config_index(usbd_device_handle dev, int index, int msg);
        (usbd_device_handle dev, u_int8_t *conf);
usbd_status     usbd_get_string_descusbd_status usbd_bulk_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
        (usbd_device_handle dev, int sindex, int langid,                                u_int16_t flags, u_int32_t timeout, void *buf,
             usb_string_descriptor_t *sdesc);                               u_int32_t *size, char *lbl);
void usbd_delay_ms (usbd_device_handle, u_int);
usbd_status usbd_intr_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
                               u_int16_t flags, u_int32_t timeout, void *buf,
usbd_status usbd_set_config_no                               u_int32_t *size, char *lbl);
        (usbd_device_handle dev, int no, int msg); 
usbd_status usbd_set_config_index 
        (usbd_device_handle dev, int index, int msg); 
 
usbd_status usbd_bulk_transfer 
        (usbd_xfer_handle xfer, usbd_pipe_handle pipe, u_int16_t flags, 
             u_int32_t timeout, void *buf, u_int32_t *size, char *lbl); 
   
 void usb_detach_wait(device_ptr_t);  void usb_detach_wait(device_ptr_t);
 void usb_detach_wakeup(device_ptr_t);  void usb_detach_wakeup(device_ptr_t);

Removed from v.1.2  
changed lines
  Added in v.1.3