From 44b382cbc0665a92f7cb15e28aa4274240ea3d1c Mon Sep 17 00:00:00 2001
From: Josef Karthauser <joe@FreeBSD.org>
Date: Mon, 1 Apr 2002 17:43:28 +0000
Subject: [PATCH] Synchronise with the NetBSD version of this header file for
formatting.
---
sys/dev/usb/usbdi.h | 156 ++++++++++++++++++++------------------------
1 file changed, 72 insertions(+), 84 deletions(-)
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index cc0d7c7f263b..aff687afb005 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -47,31 +47,31 @@ typedef void *usbd_private_handle;
typedef enum { /* keep in sync with usbd_status_msgs */
USBD_NORMAL_COMPLETION = 0, /* must be 0 */
- USBD_IN_PROGRESS,
+ USBD_IN_PROGRESS, /* 1 */
/* errors */
- USBD_PENDING_REQUESTS,
- USBD_NOT_STARTED,
- USBD_INVAL,
- USBD_NOMEM,
- USBD_CANCELLED,
- USBD_BAD_ADDRESS,
- USBD_IN_USE,
- USBD_NO_ADDR,
- USBD_SET_ADDR_FAILED,
- USBD_NO_POWER,
- USBD_TOO_DEEP,
- USBD_IOERROR,
- USBD_NOT_CONFIGURED,
- USBD_TIMEOUT,
- USBD_SHORT_XFER,
- USBD_STALLED,
- USBD_INTERRUPTED,
+ USBD_PENDING_REQUESTS, /* 2 */
+ USBD_NOT_STARTED, /* 3 */
+ USBD_INVAL, /* 4 */
+ USBD_NOMEM, /* 5 */
+ USBD_CANCELLED, /* 6 */
+ USBD_BAD_ADDRESS, /* 7 */
+ USBD_IN_USE, /* 8 */
+ USBD_NO_ADDR, /* 9 */
+ USBD_SET_ADDR_FAILED, /* 10 */
+ USBD_NO_POWER, /* 11 */
+ USBD_TOO_DEEP, /* 12 */
+ USBD_IOERROR, /* 13 */
+ USBD_NOT_CONFIGURED, /* 14 */
+ USBD_TIMEOUT, /* 15 */
+ USBD_SHORT_XFER, /* 16 */
+ USBD_STALLED, /* 17 */
+ USBD_INTERRUPTED, /* 18 */
- USBD_ERROR_MAX, /* must be last */
+ USBD_ERROR_MAX /* must be last */
} usbd_status;
typedef void (*usbd_callback)(usbd_xfer_handle, usbd_private_handle,
- usbd_status);
+ usbd_status);
/* Open flags */
#define USBD_EXCLUSIVE_USE 0x01
@@ -95,97 +95,85 @@ typedef void (*usbd_callback)(usbd_xfer_handle, usbd_private_handle,
#define USB_CDEV_MAJOR 108
#endif
-usbd_status usbd_open_pipe
- (usbd_interface_handle iface, u_int8_t address,
- u_int8_t flags, usbd_pipe_handle *pipe);
-usbd_status usbd_close_pipe (usbd_pipe_handle pipe);
-usbd_status usbd_transfer (usbd_xfer_handle req);
-usbd_xfer_handle usbd_alloc_xfer (usbd_device_handle);
-usbd_status usbd_free_xfer (usbd_xfer_handle xfer);
-void usbd_setup_xfer
- (usbd_xfer_handle xfer, usbd_pipe_handle pipe,
- usbd_private_handle priv, void *buffer,
- u_int32_t length, u_int16_t flags, u_int32_t timeout,
- usbd_callback);
-void usbd_setup_default_xfer
- (usbd_xfer_handle xfer, usbd_device_handle dev,
- usbd_private_handle priv, u_int32_t timeout,
- usb_device_request_t *req, void *buffer,
- u_int32_t length, u_int16_t flags, usbd_callback);
-void usbd_setup_isoc_xfer
- (usbd_xfer_handle xfer, usbd_pipe_handle pipe,
- usbd_private_handle priv, u_int16_t *frlengths,
- u_int32_t nframes, u_int16_t flags, usbd_callback);
-void usbd_get_xfer_status
- (usbd_xfer_handle xfer, usbd_private_handle *priv,
- void **buffer, u_int32_t *count, usbd_status *status);
+usbd_status usbd_open_pipe(usbd_interface_handle iface, u_int8_t address,
+ u_int8_t flags, usbd_pipe_handle *pipe);
+usbd_status usbd_close_pipe(usbd_pipe_handle pipe);
+usbd_status usbd_transfer(usbd_xfer_handle req);
+usbd_xfer_handle usbd_alloc_xfer(usbd_device_handle);
+usbd_status usbd_free_xfer(usbd_xfer_handle xfer);
+void usbd_setup_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
+ usbd_private_handle priv, void *buffer,
+ u_int32_t length, u_int16_t flags, u_int32_t timeout,
+ usbd_callback);
+void usbd_setup_default_xfer(usbd_xfer_handle xfer, usbd_device_handle dev,
+ usbd_private_handle priv, u_int32_t timeout,
+ usb_device_request_t *req, void *buffer,
+ u_int32_t length, u_int16_t flags, usbd_callback);
+void usbd_setup_isoc_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
+ usbd_private_handle priv, u_int16_t *frlengths,
+ u_int32_t nframes, u_int16_t flags, usbd_callback);
+void usbd_get_xfer_status(usbd_xfer_handle xfer, usbd_private_handle *priv,
+ void **buffer, u_int32_t *count, usbd_status *status);
usb_endpoint_descriptor_t *usbd_interface2endpoint_descriptor
- (usbd_interface_handle iface, u_int8_t address);
+ (usbd_interface_handle iface, u_int8_t address);
usbd_status usbd_abort_pipe(usbd_pipe_handle pipe);
usbd_status usbd_clear_endpoint_stall(usbd_pipe_handle pipe);
usbd_status usbd_clear_endpoint_stall_async(usbd_pipe_handle pipe);
void usbd_clear_endpoint_toggle(usbd_pipe_handle pipe);
-usbd_status usbd_endpoint_count
- (usbd_interface_handle dev, u_int8_t *count);
-usbd_status usbd_interface_count
- (usbd_device_handle dev, u_int8_t *count);
-usbd_status usbd_interface2device_handle
- (usbd_interface_handle iface, usbd_device_handle *dev);
-usbd_status usbd_device2interface_handle
- (usbd_device_handle dev, u_int8_t ifaceno, usbd_interface_handle *iface);
+usbd_status usbd_endpoint_count(usbd_interface_handle dev, u_int8_t *count);
+usbd_status usbd_interface_count(usbd_device_handle dev, u_int8_t *count);
+usbd_status usbd_interface2device_handle(usbd_interface_handle iface,
+ usbd_device_handle *dev);
+usbd_status usbd_device2interface_handle(usbd_device_handle dev,
+ u_int8_t ifaceno, usbd_interface_handle *iface);
usbd_device_handle usbd_pipe2device_handle(usbd_pipe_handle);
-void *usbd_alloc_buffer(usbd_xfer_handle req, u_int32_t size);
-void usbd_free_buffer(usbd_xfer_handle req);
+void *usbd_alloc_buffer(usbd_xfer_handle xfer, u_int32_t size);
+void usbd_free_buffer(usbd_xfer_handle xfer);
void *usbd_get_buffer(usbd_xfer_handle xfer);
usbd_status usbd_sync_transfer(usbd_xfer_handle req);
-usbd_status usbd_open_pipe_intr
- (usbd_interface_handle iface, u_int8_t address,
- u_int8_t flags, usbd_pipe_handle *pipe,
- usbd_private_handle priv, void *buffer,
- u_int32_t length, usbd_callback, int);
-usbd_status usbd_do_request
- (usbd_device_handle pipe, usb_device_request_t *req, void *data);
-usbd_status usbd_do_request_async
- (usbd_device_handle pipe, usb_device_request_t *req, void *data);
-usbd_status usbd_do_request_flags
- (usbd_device_handle pipe, usb_device_request_t *req,
- void *data, u_int16_t flags, int *);
+usbd_status usbd_open_pipe_intr(usbd_interface_handle iface, u_int8_t address,
+ u_int8_t flags, usbd_pipe_handle *pipe,
+ usbd_private_handle priv, void *buffer,
+ u_int32_t length, usbd_callback, int);
+usbd_status usbd_do_request(usbd_device_handle pipe, usb_device_request_t *req,
+ void *data);
+usbd_status usbd_do_request_async(usbd_device_handle pipe,
+ usb_device_request_t *req, void *data);
+usbd_status usbd_do_request_flags(usbd_device_handle pipe,
+ usb_device_request_t *req,
+ void *data, u_int16_t flags, int *);
usbd_status usbd_do_request_flags_pipe(
usbd_device_handle dev, usbd_pipe_handle pipe,
usb_device_request_t *req, void *data, u_int16_t flags, int *actlen);
usb_interface_descriptor_t *usbd_get_interface_descriptor
- (usbd_interface_handle iface);
-usb_config_descriptor_t *usbd_get_config_descriptor
- (usbd_device_handle dev);
-usb_device_descriptor_t *usbd_get_device_descriptor
- (usbd_device_handle dev);
+ (usbd_interface_handle iface);
+usb_config_descriptor_t *usbd_get_config_descriptor(usbd_device_handle dev);
+usb_device_descriptor_t *usbd_get_device_descriptor(usbd_device_handle dev);
usbd_status usbd_set_interface(usbd_interface_handle, int);
int usbd_get_no_alts(usb_config_descriptor_t *, int);
-usbd_status usbd_get_interface
- (usbd_interface_handle iface, u_int8_t *aiface);
-void usbd_fill_deviceinfo
- (usbd_device_handle dev, struct usb_device_info *di, int usedev);
+usbd_status usbd_get_interface(usbd_interface_handle iface, u_int8_t *aiface);
+void usbd_fill_deviceinfo(usbd_device_handle, struct usb_device_info *, int);
int usbd_get_interface_altindex(usbd_interface_handle iface);
-usb_interface_descriptor_t *usbd_find_idesc
- (usb_config_descriptor_t *cd, int iindex, int ano);
-usb_endpoint_descriptor_t *usbd_find_edesc
- (usb_config_descriptor_t *cd, int ifaceidx, int altidx,
- int endptidx);
+usb_interface_descriptor_t *usbd_find_idesc(usb_config_descriptor_t *cd,
+ int iindex, int ano);
+usb_endpoint_descriptor_t *usbd_find_edesc(usb_config_descriptor_t *cd,
+ int ifaceidx, int altidx,
+ int endptidx);
void usbd_dopoll(usbd_interface_handle);
void usbd_set_polling(usbd_interface_handle iface, int on);
const char *usbd_errstr(usbd_status err);
-void usbd_add_dev_event (int, usbd_device_handle);
-void usbd_add_drv_event (int, usbd_device_handle, device_ptr_t);
+void usbd_add_dev_event(int, usbd_device_handle);
+void usbd_add_drv_event(int, usbd_device_handle, device_ptr_t);
void usbd_devinfo(usbd_device_handle, int, char *);
const struct usbd_quirks *usbd_get_quirks(usbd_device_handle);
usb_endpoint_descriptor_t *usbd_get_endpoint_descriptor
- (usbd_interface_handle iface, u_int8_t address);
+ (usbd_interface_handle iface, u_int8_t address);
usbd_status usbd_reload_device_desc(usbd_device_handle);