diff options
| author | Josef Karthauser <joe@FreeBSD.org> | 2002-04-01 16:09:43 +0000 |
|---|---|---|
| committer | Josef Karthauser <joe@FreeBSD.org> | 2002-04-01 16:09:43 +0000 |
| commit | c0fdce44636b95fabc6853528509c37b665ccf3d (patch) | |
| tree | 6c3b18db282ba6fa68b86b60db6157f7803dd3b3 /sys/dev/usb/usbdi_util.h | |
| parent | 85b64f4ceac75940c46e43fad30a1f2fb530d5cc (diff) | |
| download | src-c0fdce44636b95fabc6853528509c37b665ccf3d.tar.gz src-c0fdce44636b95fabc6853528509c37b665ccf3d.zip | |
Merge from NetBSD:
usb_port.h (1.33), usbdi_util.c (1.32), usbdi_util.h (1.22):
----------------------------
date: 2000/06/01 14:37:51; author: augustss;
Improve some portability items.
----------------------------
Notes
Notes:
svn path=/head/; revision=93543
Diffstat (limited to 'sys/dev/usb/usbdi_util.h')
| -rw-r--r-- | sys/dev/usb/usbdi_util.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h index 1e53f8816d86..ca8c82a4dacd 100644 --- a/sys/dev/usb/usbdi_util.h +++ b/sys/dev/usb/usbdi_util.h @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi_util.h,v 1.17 1999/09/05 19:32:19 augustss Exp $ */ +/* $NetBSD: usbdi_util.h,v 1.22 2000/06/01 14:37:52 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -65,13 +65,8 @@ usbd_status usbd_set_report_async(usbd_interface_handle iface, int type, usbd_status usbd_get_report(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); -#if defined(__NetBSD__) || defined(__OpenBSD__) -usbd_status usbd_alloc_report_desc - (usbd_interface_handle ifc, void **descp, int *sizep, int mem); -#elif defined(__FreeBSD__) -usbd_status usbd_alloc_report_desc - (usbd_interface_handle ifc, void **descp, int *sizep, struct malloc_type * mem); -#endif +usbd_status usbd_alloc_report_desc(usbd_interface_handle ifc, void **descp, + int *sizep, usb_malloc_type mem); usbd_status usbd_get_config(usbd_device_handle dev, u_int8_t *conf); usbd_status usbd_get_string_desc(usbd_device_handle dev, int sindex, int langid, usb_string_descriptor_t *sdesc); |