diff options
Diffstat (limited to 'sys/dev/usb/usb_device.h')
| -rw-r--r-- | sys/dev/usb/usb_device.h | 149 |
1 files changed, 96 insertions, 53 deletions
diff --git a/sys/dev/usb/usb_device.h b/sys/dev/usb/usb_device.h index 647757111c16..2a5f163427f6 100644 --- a/sys/dev/usb/usb_device.h +++ b/sys/dev/usb/usb_device.h @@ -27,7 +27,7 @@ #ifndef _USB2_DEVICE_H_ #define _USB2_DEVICE_H_ -struct usb2_symlink; /* UGEN */ +struct usb_symlink; /* UGEN */ struct usb_device; /* linux compat */ #define USB_DEFAULT_XFER_MAX 2 @@ -44,20 +44,47 @@ struct usb_device; /* linux compat */ #define USB_UNCFG_FLAG_FREE_SUBDEV 0x01 /* subdevices are freed */ #define USB_UNCFG_FLAG_FREE_EP0 0x02 /* endpoint zero is freed */ -struct usb2_clear_stall_msg { - struct usb2_proc_msg hdr; - struct usb2_device *udev; +struct usb_clear_stall_msg { + struct usb_proc_msg hdr; + struct usb_device *udev; }; +/* The following four structures makes up a tree, where we have the + * leaf structure, "usb_host_endpoint", first, and the root structure, + * "usb_device", last. The four structures below mirror the structure + * of the USB descriptors belonging to an USB configuration. Please + * refer to the USB specification for a definition of "endpoints" and + * "interfaces". + */ +struct usb_host_endpoint { + struct usb_endpoint_descriptor desc; + TAILQ_HEAD(, urb) bsd_urb_list; + struct usb_xfer *bsd_xfer[2]; + uint8_t *extra; /* Extra descriptors */ + usb2_frlength_t fbsd_buf_size; + uint16_t extralen; + uint8_t bsd_iface_index; +} __aligned(USB_HOST_ALIGN); + +struct usb_host_interface { + struct usb_interface_descriptor desc; + /* the following array has size "desc.bNumEndpoint" */ + struct usb_host_endpoint *endpoint; + const char *string; /* iInterface string, if present */ + uint8_t *extra; /* Extra descriptors */ + uint16_t extralen; + uint8_t bsd_iface_index; +} __aligned(USB_HOST_ALIGN); + /* * The following structure defines an USB pipe which is equal to an * USB endpoint. */ -struct usb2_pipe { - struct usb2_xfer_queue pipe_q; /* queue of USB transfers */ +struct usb_pipe { + struct usb_xfer_queue pipe_q; /* queue of USB transfers */ - struct usb2_endpoint_descriptor *edesc; - struct usb2_pipe_methods *methods; /* set by HC driver */ + struct usb_endpoint_descriptor *edesc; + struct usb_pipe_methods *methods; /* set by HC driver */ uint16_t isoc_next; uint16_t refcount; @@ -72,17 +99,25 @@ struct usb2_pipe { /* * The following structure defines an USB interface. */ -struct usb2_interface { - struct usb2_interface_descriptor *idesc; +struct usb_interface { + struct usb_interface_descriptor *idesc; device_t subdev; uint8_t alt_index; uint8_t parent_iface_index; + + /* Linux compat */ + struct usb_host_interface *altsetting; + struct usb_host_interface *cur_altsetting; + struct usb_device *linux_udev; + void *bsd_priv_sc; /* device specific information */ + uint8_t num_altsetting; /* number of alternate settings */ + uint8_t bsd_iface_index; }; /* * The following structure defines the USB device flags. */ -struct usb2_device_flags { +struct usb_device_flags { enum usb_hc_mode usb_mode; /* host or device mode */ uint8_t self_powered:1; /* set if USB device is self powered */ uint8_t no_strings:1; /* set if USB device does not support @@ -103,7 +138,7 @@ struct usb2_device_flags { * The following structure is used for power-save purposes. The data * in this structure is protected by the USB BUS lock. */ -struct usb2_power_save { +struct usb_power_save { usb2_ticks_t last_xfer_time; /* copy of "ticks" */ usb2_size_t type_refs[4]; /* transfer reference count */ usb2_size_t read_refs; /* data read references */ @@ -114,33 +149,30 @@ struct usb2_power_save { * The following structure defines an USB device. There exists one of * these structures for every USB device. */ -struct usb2_device { - struct usb2_clear_stall_msg cs_msg[2]; /* generic clear stall +struct usb_device { + struct usb_clear_stall_msg cs_msg[2]; /* generic clear stall * messages */ struct sx default_sx[2]; struct mtx default_mtx[1]; struct cv default_cv[2]; - struct usb2_interface *ifaces; - struct usb2_pipe default_pipe; /* Control Endpoint 0 */ - struct usb2_pipe *pipes; - struct usb2_power_save pwr_save;/* power save data */ - struct usb2_bus *bus; /* our USB BUS */ + struct usb_interface *ifaces; + struct usb_pipe default_pipe; /* Control Endpoint 0 */ + struct usb_pipe *pipes; + struct usb_power_save pwr_save;/* power save data */ + struct usb_bus *bus; /* our USB BUS */ device_t parent_dev; /* parent device */ - struct usb2_device *parent_hub; - struct usb2_device *parent_hs_hub; /* high-speed parent HUB */ - struct usb2_config_descriptor *cdesc; /* full config descr */ - struct usb2_hub *hub; /* only if this is a hub */ -#if USB_HAVE_COMPAT_LINUX - struct usb_device *linux_dev; -#endif - struct usb2_xfer *default_xfer[USB_DEFAULT_XFER_MAX]; - struct usb2_temp_data *usb2_template_ptr; - struct usb2_pipe *pipe_curr; /* current clear stall pipe */ + struct usb_device *parent_hub; + struct usb_device *parent_hs_hub; /* high-speed parent HUB */ + struct usb_config_descriptor *cdesc; /* full config descr */ + struct usb_hub *hub; /* only if this is a hub */ + struct usb_xfer *default_xfer[USB_DEFAULT_XFER_MAX]; + struct usb_temp_data *usb2_template_ptr; + struct usb_pipe *pipe_curr; /* current clear stall pipe */ #if USB_HAVE_UGEN - struct usb2_fifo *fifo[USB_FIFO_MAX]; - struct usb2_symlink *ugen_symlink; /* our generic symlink */ + struct usb_fifo *fifo[USB_FIFO_MAX]; + struct usb_symlink *ugen_symlink; /* our generic symlink */ struct cdev *default_dev; /* Control Endpoint 0 device node */ - LIST_HEAD(,usb2_fs_privdata) pd_list; + LIST_HEAD(,usb_fs_privdata) pd_list; char ugen_name[20]; /* name of ugenX.X device */ #endif usb2_ticks_t plugtime; /* copy of "ticks" */ @@ -169,14 +201,25 @@ struct usb2_device { /* the "flags" field is write-protected by "bus->mtx" */ - struct usb2_device_flags flags; + struct usb_device_flags flags; - struct usb2_endpoint_descriptor default_ep_desc; /* for pipe 0 */ - struct usb2_device_descriptor ddesc; /* device descriptor */ + struct usb_endpoint_descriptor default_ep_desc; /* for pipe 0 */ + struct usb_device_descriptor ddesc; /* device descriptor */ char *serial; /* serial number */ char *manufacturer; /* manufacturer string */ char *product; /* product string */ + +#if USB_HAVE_COMPAT_LINUX + /* Linux compat */ + struct usb_device_descriptor descriptor; + struct usb_host_endpoint ep0; + struct usb_interface *linux_iface_start; + struct usb_interface *linux_iface_end; + struct usb_host_endpoint *linux_endpoint_start; + struct usb_host_endpoint *linux_endpoint_end; + uint16_t devnum; +#endif }; /* globals */ @@ -185,32 +228,32 @@ extern int usb2_template; /* function prototypes */ -struct usb2_device *usb2_alloc_device(device_t parent_dev, struct usb2_bus *bus, - struct usb2_device *parent_hub, uint8_t depth, +struct usb_device *usb2_alloc_device(device_t parent_dev, struct usb_bus *bus, + struct usb_device *parent_hub, uint8_t depth, uint8_t port_index, uint8_t port_no, enum usb_dev_speed speed, enum usb_hc_mode mode); -struct usb2_pipe *usb2_get_pipe(struct usb2_device *udev, uint8_t iface_index, - const struct usb2_config *setup); -struct usb2_pipe *usb2_get_pipe_by_addr(struct usb2_device *udev, uint8_t ea_val); -usb2_error_t usb2_interface_count(struct usb2_device *udev, uint8_t *count); -usb2_error_t usb2_probe_and_attach(struct usb2_device *udev, +struct usb_pipe *usb2_get_pipe(struct usb_device *udev, uint8_t iface_index, + const struct usb_config *setup); +struct usb_pipe *usb2_get_pipe_by_addr(struct usb_device *udev, uint8_t ea_val); +usb2_error_t usb2_interface_count(struct usb_device *udev, uint8_t *count); +usb2_error_t usb2_probe_and_attach(struct usb_device *udev, uint8_t iface_index); -usb2_error_t usb2_reset_iface_endpoints(struct usb2_device *udev, +usb2_error_t usb2_reset_iface_endpoints(struct usb_device *udev, uint8_t iface_index); -usb2_error_t usb2_set_config_index(struct usb2_device *udev, uint8_t index); -usb2_error_t usb2_set_endpoint_stall(struct usb2_device *udev, - struct usb2_pipe *pipe, uint8_t do_stall); -usb2_error_t usb2_suspend_resume(struct usb2_device *udev, +usb2_error_t usb2_set_config_index(struct usb_device *udev, uint8_t index); +usb2_error_t usb2_set_endpoint_stall(struct usb_device *udev, + struct usb_pipe *pipe, uint8_t do_stall); +usb2_error_t usb2_suspend_resume(struct usb_device *udev, uint8_t do_suspend); -void usb2_devinfo(struct usb2_device *udev, char *dst_ptr, uint16_t dst_len); -void usb2_free_device(struct usb2_device *, uint8_t); -void *usb2_find_descriptor(struct usb2_device *udev, void *id, +void usb2_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len); +void usb2_free_device(struct usb_device *, uint8_t); +void *usb2_find_descriptor(struct usb_device *udev, void *id, uint8_t iface_index, uint8_t type, uint8_t type_mask, uint8_t subtype, uint8_t subtype_mask); void usb_linux_free_device(struct usb_device *dev); -uint8_t usb2_peer_can_wakeup(struct usb2_device *udev); -struct usb2_pipe *usb2_pipe_foreach(struct usb2_device *udev, struct usb2_pipe *pipe); -void usb2_set_device_state(struct usb2_device *udev, +uint8_t usb2_peer_can_wakeup(struct usb_device *udev); +struct usb_pipe *usb2_pipe_foreach(struct usb_device *udev, struct usb_pipe *pipe); +void usb2_set_device_state(struct usb_device *udev, enum usb_dev_state state); #endif /* _USB2_DEVICE_H_ */ |