summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-09 12:03:40 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-09 12:03:40 +0000
commite518769359114d7fb2f2bbbb06fe97f694d638aa (patch)
tree40412415ef2b99fe7bfe5a2c6312c3124e049948 /sys
parent82c36963aebbc9857585762c82c7a5d111420c7e (diff)
Remove the definition and use of usb_malloc_type which is really int.
While here, reindent the function prototypes in usbdi_util.h No binary change. ok jsg
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/usb_port.h4
-rw-r--r--sys/dev/usb/usbdi_util.c4
-rw-r--r--sys/dev/usb/usbdi_util.h40
3 files changed, 23 insertions, 25 deletions
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 4473fe94d63..8096c775cc7 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_port.h,v 1.71 2007/06/06 19:25:49 mk Exp $ */
+/* $OpenBSD: usb_port.h,v 1.72 2007/06/09 12:03:39 mbalmer Exp $ */
/* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -105,8 +105,6 @@ typedef struct proc *usb_proc_ptr;
#define sel_klist si_note
-typedef int usb_malloc_type;
-
#define if_deactivate(x)
#define IF_INPUT(ifp, m) ether_input_mbuf((ifp), (m))
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index fd23bfdbd19..5d2f4c3a2cf 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdi_util.c,v 1.20 2007/06/05 08:43:56 mbalmer Exp $ */
+/* $OpenBSD: usbdi_util.c,v 1.21 2007/06/09 12:03:39 mbalmer Exp $ */
/* $NetBSD: usbdi_util.c,v 1.40 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.14 1999/11/17 22:33:50 n_hibma Exp $ */
@@ -378,7 +378,7 @@ usbd_get_hid_descriptor(usbd_interface_handle ifc)
usbd_status
usbd_read_report_desc(usbd_interface_handle ifc, void **descp, int *sizep,
- usb_malloc_type mem)
+ int 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 020e034d1cd..c5d5af8ea6e 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/dev/usb/usbdi_util.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdi_util.h,v 1.14 2004/10/31 12:10:52 dlg Exp $ */
+/* $OpenBSD: usbdi_util.h,v 1.15 2007/06/09 12:03:39 mbalmer Exp $ */
/* $NetBSD: usbdi_util.h,v 1.28 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.9 1999/11/17 22:33:50 n_hibma Exp $ */
@@ -40,15 +40,15 @@
*/
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,
- usb_config_descriptor_t *);
+ usb_config_descriptor_t *);
usbd_status usbd_get_config_desc_full(usbd_device_handle, int, void *, int);
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_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_clear_hub_feature(usbd_device_handle, int);
usbd_status usbd_set_port_feature(usbd_device_handle dev, int, int);
@@ -58,34 +58,34 @@ usbd_status usbd_get_hub_status(usbd_device_handle, usb_hub_status_t *);
usbd_status usbd_get_protocol(usbd_interface_handle dev, u_int8_t *report);
usbd_status usbd_set_protocol(usbd_interface_handle dev, int report);
usbd_status usbd_get_report_descriptor(usbd_device_handle dev, int ifcno,
- int size, void *d);
+ int size, void *d);
struct usb_hid_descriptor *usbd_get_hid_descriptor(usbd_interface_handle ifc);
usbd_status usbd_set_report(usbd_interface_handle iface, int type, int id,
- void *data,int len);
+ void *data,int len);
usbd_status usbd_set_report_async(usbd_interface_handle iface, int type,
- int id, void *data, int len);
+ int id, void *data, int len);
usbd_status usbd_get_report(usbd_interface_handle iface, int type, int id,
- void *data, int len);
+ void *data, int len);
usbd_status usbd_set_idle(usbd_interface_handle iface, int duration,int id);
usbd_status usbd_read_report_desc(usbd_interface_handle ifc, void **descp,
- int *sizep, usb_malloc_type mem);
+ int *sizep, int 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,
- int *sizep);
+ int langid,usb_string_descriptor_t *sdesc, int *sizep);
void usbd_delay_ms(usbd_device_handle, u_int);
-usbd_status usbd_set_config_no(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_set_config_no(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);
+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);
-usbd_status usbd_intr_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);
+usbd_status usbd_intr_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_wakeup(device_ptr_t);