29cc88979a
Now ${LINUX}/drivers/usb/* can use usb_endpoint_maxp(desc) to get maximum packet size instead of le16_to_cpu(desc->wMaxPacketSize). This patch fix it up Cc: Armin Fuerst <fuerst@in.tum.de> Cc: Pavel Machek <pavel@ucw.cz> Cc: Johannes Erdfelt <johannes@erdfelt.com> Cc: Vojtech Pavlik <vojtech@suse.cz> Cc: Oliver Neukum <oliver@neukum.name> Cc: David Kubicek <dave@awk.cz> Cc: Johan Hovold <jhovold@gmail.com> Cc: Brad Hards <bhards@bigpond.net.au> Acked-by: Felipe Balbi <balbi@ti.com> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Thomas Dahlmann <dahlmann.thomas@arcor.de> Cc: David Brownell <david-b@pacbell.net> Cc: David Lopo <dlopo@chipidea.mips.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Michal Nazarewicz <m.nazarewicz@samsung.com> Cc: Xie Xiaobo <X.Xie@freescale.com> Cc: Li Yang <leoli@freescale.com> Cc: Jiang Bo <tanya.jiang@freescale.com> Cc: Yuan-hsin Chen <yhchen@faraday-tech.com> Cc: Darius Augulis <augulis.darius@gmail.com> Cc: Xiaochen Shen <xiaochen.shen@intel.com> Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Cc: OKI SEMICONDUCTOR, <toshiharu-linux@dsn.okisemi.com> Cc: Robert Jarzmik <robert.jarzmik@free.fr> Cc: Ben Dooks <ben@simtec.co.uk> Cc: Thomas Abraham <thomas.ab@samsung.com> Cc: Herbert Pƶtzl <herbert@13thfloor.at> Cc: Arnaud Patard <arnaud.patard@rtp-net.org> Cc: Roman Weissgaerber <weissg@vienna.at> Acked-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Cc: Tony Olech <tony.olech@elandigitalsystems.com> Cc: Florian Floe Echtler <echtler@fs.tum.de> Cc: Christian Lucht <lucht@codemercs.com> Cc: Juergen Stuber <starblue@sourceforge.net> Cc: Georges Toth <g.toth@e-biz.lu> Cc: Bill Ryder <bryder@sgi.com> Cc: Kuba Ober <kuba@mareimbrium.org> Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
218 lines
5.1 KiB
C
218 lines
5.1 KiB
C
/*
|
|
* drivers/usb/core/endpoint.c
|
|
*
|
|
* (C) Copyright 2002,2004,2006 Greg Kroah-Hartman
|
|
* (C) Copyright 2002,2004 IBM Corp.
|
|
* (C) Copyright 2006 Novell Inc.
|
|
*
|
|
* Endpoint sysfs stuff
|
|
*
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/idr.h>
|
|
#include <linux/usb.h>
|
|
#include "usb.h"
|
|
|
|
struct ep_device {
|
|
struct usb_endpoint_descriptor *desc;
|
|
struct usb_device *udev;
|
|
struct device dev;
|
|
};
|
|
#define to_ep_device(_dev) \
|
|
container_of(_dev, struct ep_device, dev)
|
|
|
|
struct device_type usb_ep_device_type = {
|
|
.name = "usb_endpoint",
|
|
};
|
|
|
|
struct ep_attribute {
|
|
struct attribute attr;
|
|
ssize_t (*show)(struct usb_device *,
|
|
struct usb_endpoint_descriptor *, char *);
|
|
};
|
|
#define to_ep_attribute(_attr) \
|
|
container_of(_attr, struct ep_attribute, attr)
|
|
|
|
#define usb_ep_attr(field, format_string) \
|
|
static ssize_t show_ep_##field(struct device *dev, \
|
|
struct device_attribute *attr, \
|
|
char *buf) \
|
|
{ \
|
|
struct ep_device *ep = to_ep_device(dev); \
|
|
return sprintf(buf, format_string, ep->desc->field); \
|
|
} \
|
|
static DEVICE_ATTR(field, S_IRUGO, show_ep_##field, NULL);
|
|
|
|
usb_ep_attr(bLength, "%02x\n")
|
|
usb_ep_attr(bEndpointAddress, "%02x\n")
|
|
usb_ep_attr(bmAttributes, "%02x\n")
|
|
usb_ep_attr(bInterval, "%02x\n")
|
|
|
|
static ssize_t show_ep_wMaxPacketSize(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct ep_device *ep = to_ep_device(dev);
|
|
return sprintf(buf, "%04x\n",
|
|
usb_endpoint_maxp(ep->desc) & 0x07ff);
|
|
}
|
|
static DEVICE_ATTR(wMaxPacketSize, S_IRUGO, show_ep_wMaxPacketSize, NULL);
|
|
|
|
static ssize_t show_ep_type(struct device *dev, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct ep_device *ep = to_ep_device(dev);
|
|
char *type = "unknown";
|
|
|
|
switch (usb_endpoint_type(ep->desc)) {
|
|
case USB_ENDPOINT_XFER_CONTROL:
|
|
type = "Control";
|
|
break;
|
|
case USB_ENDPOINT_XFER_ISOC:
|
|
type = "Isoc";
|
|
break;
|
|
case USB_ENDPOINT_XFER_BULK:
|
|
type = "Bulk";
|
|
break;
|
|
case USB_ENDPOINT_XFER_INT:
|
|
type = "Interrupt";
|
|
break;
|
|
}
|
|
return sprintf(buf, "%s\n", type);
|
|
}
|
|
static DEVICE_ATTR(type, S_IRUGO, show_ep_type, NULL);
|
|
|
|
static ssize_t show_ep_interval(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct ep_device *ep = to_ep_device(dev);
|
|
char unit;
|
|
unsigned interval = 0;
|
|
unsigned in;
|
|
|
|
in = (ep->desc->bEndpointAddress & USB_DIR_IN);
|
|
|
|
switch (usb_endpoint_type(ep->desc)) {
|
|
case USB_ENDPOINT_XFER_CONTROL:
|
|
if (ep->udev->speed == USB_SPEED_HIGH)
|
|
/* uframes per NAK */
|
|
interval = ep->desc->bInterval;
|
|
break;
|
|
|
|
case USB_ENDPOINT_XFER_ISOC:
|
|
interval = 1 << (ep->desc->bInterval - 1);
|
|
break;
|
|
|
|
case USB_ENDPOINT_XFER_BULK:
|
|
if (ep->udev->speed == USB_SPEED_HIGH && !in)
|
|
/* uframes per NAK */
|
|
interval = ep->desc->bInterval;
|
|
break;
|
|
|
|
case USB_ENDPOINT_XFER_INT:
|
|
if (ep->udev->speed == USB_SPEED_HIGH)
|
|
interval = 1 << (ep->desc->bInterval - 1);
|
|
else
|
|
interval = ep->desc->bInterval;
|
|
break;
|
|
}
|
|
interval *= (ep->udev->speed == USB_SPEED_HIGH) ? 125 : 1000;
|
|
if (interval % 1000)
|
|
unit = 'u';
|
|
else {
|
|
unit = 'm';
|
|
interval /= 1000;
|
|
}
|
|
|
|
return sprintf(buf, "%d%cs\n", interval, unit);
|
|
}
|
|
static DEVICE_ATTR(interval, S_IRUGO, show_ep_interval, NULL);
|
|
|
|
static ssize_t show_ep_direction(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct ep_device *ep = to_ep_device(dev);
|
|
char *direction;
|
|
|
|
if (usb_endpoint_xfer_control(ep->desc))
|
|
direction = "both";
|
|
else if (usb_endpoint_dir_in(ep->desc))
|
|
direction = "in";
|
|
else
|
|
direction = "out";
|
|
return sprintf(buf, "%s\n", direction);
|
|
}
|
|
static DEVICE_ATTR(direction, S_IRUGO, show_ep_direction, NULL);
|
|
|
|
static struct attribute *ep_dev_attrs[] = {
|
|
&dev_attr_bLength.attr,
|
|
&dev_attr_bEndpointAddress.attr,
|
|
&dev_attr_bmAttributes.attr,
|
|
&dev_attr_bInterval.attr,
|
|
&dev_attr_wMaxPacketSize.attr,
|
|
&dev_attr_interval.attr,
|
|
&dev_attr_type.attr,
|
|
&dev_attr_direction.attr,
|
|
NULL,
|
|
};
|
|
static struct attribute_group ep_dev_attr_grp = {
|
|
.attrs = ep_dev_attrs,
|
|
};
|
|
static const struct attribute_group *ep_dev_groups[] = {
|
|
&ep_dev_attr_grp,
|
|
NULL
|
|
};
|
|
|
|
static void ep_device_release(struct device *dev)
|
|
{
|
|
struct ep_device *ep_dev = to_ep_device(dev);
|
|
|
|
kfree(ep_dev);
|
|
}
|
|
|
|
int usb_create_ep_devs(struct device *parent,
|
|
struct usb_host_endpoint *endpoint,
|
|
struct usb_device *udev)
|
|
{
|
|
struct ep_device *ep_dev;
|
|
int retval;
|
|
|
|
ep_dev = kzalloc(sizeof(*ep_dev), GFP_KERNEL);
|
|
if (!ep_dev) {
|
|
retval = -ENOMEM;
|
|
goto exit;
|
|
}
|
|
|
|
ep_dev->desc = &endpoint->desc;
|
|
ep_dev->udev = udev;
|
|
ep_dev->dev.groups = ep_dev_groups;
|
|
ep_dev->dev.type = &usb_ep_device_type;
|
|
ep_dev->dev.parent = parent;
|
|
ep_dev->dev.release = ep_device_release;
|
|
dev_set_name(&ep_dev->dev, "ep_%02x", endpoint->desc.bEndpointAddress);
|
|
|
|
retval = device_register(&ep_dev->dev);
|
|
if (retval)
|
|
goto error_register;
|
|
|
|
device_enable_async_suspend(&ep_dev->dev);
|
|
endpoint->ep_dev = ep_dev;
|
|
return retval;
|
|
|
|
error_register:
|
|
put_device(&ep_dev->dev);
|
|
exit:
|
|
return retval;
|
|
}
|
|
|
|
void usb_remove_ep_devs(struct usb_host_endpoint *endpoint)
|
|
{
|
|
struct ep_device *ep_dev = endpoint->ep_dev;
|
|
|
|
if (ep_dev) {
|
|
device_unregister(&ep_dev->dev);
|
|
endpoint->ep_dev = NULL;
|
|
}
|
|
}
|