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.
    ----------------------------

3 files changed, 11 insertions, 15 deletions

diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index f0d3aaa..263b459 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -86,6 +86,8 @@ typedef struct callout usb_callout_t;
 #define usb_callout(h, t, f, d) ((h) = timeout((f), (d), (t)))
 #define usb_uncallout(h, f, d) untimeout((f), (d))
 
+typedef int usb_malloc_type;
+
 #define logprintf printf
 
 #define USB_DECLARE_DRIVER(dname)  \
@@ -183,6 +185,8 @@ typedef struct proc *usb_proc_ptr;
 #define	config_pending_incr()
 #define	config_pending_decr()
 
+typedef int usb_malloc_type;
+
 #define	usbpoll			usbselect
 #define	uhidpoll		uhidselect
 #define	ugenpoll		ugenselect
@@ -335,6 +339,8 @@ typedef struct callout usb_callout_t;
 #define PWR_RESUME 0
 #define PWR_SUSPEND 1
 
+typedef struct malloc_type *usb_malloc_type;
+
 #define USB_DECLARE_DRIVER_INIT(dname, init...) \
 Static device_probe_t __CONCAT(dname,_match); \
 Static device_attach_t __CONCAT(dname,_attach); \
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 6cf8b6a..cc05d41 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.c,v 1.31 2000/06/01 14:29:02 augustss Exp $	*/
+/*	$NetBSD: usbdi_util.c,v 1.32 2000/06/01 14:37:51 augustss Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
@@ -380,12 +380,7 @@ usbd_get_hid_descriptor(usbd_interface_handle ifc)
 
 usbd_status
 usbd_alloc_report_desc(usbd_interface_handle ifc, void **descp, int *sizep,
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-	int mem;
-#elif defined(__FreeBSD__)
-	struct malloc_type *mem;
-#endif
-	)
+		       usb_malloc_type mem)
 {
 	usb_interface_descriptor_t *id;
 	usb_hid_descriptor_t *hid;
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index 1e53f88..ca8c82a 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);