From: Yauheni Kaliuta <yauheni.kaliuta@xxxxxxxxx>
g_mtp is the gadget driver implementing
media transfer protocol.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@xxxxxxxxx>
Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
---
drivers/usb/gadget/Kconfig | 11 +
drivers/usb/gadget/Makefile | 2 +
drivers/usb/gadget/f_mtp.c | 869 +++++++++++++++++++++++++++++++++++++++++++
drivers/usb/gadget/mtp.c | 249 +++++++++++++
include/linux/usb/ptp.h | 105 ++++++
5 files changed, 1236 insertions(+), 0 deletions(-)
create mode 100644 drivers/usb/gadget/f_mtp.c
create mode 100644 drivers/usb/gadget/mtp.c
create mode 100644 include/linux/usb/ptp.h
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 7460cd7..876f534 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -822,6 +822,17 @@ config USB_G_NOKIA
It's only really useful for N900 hardware. If you're building
a kernel for N900, say Y or M here. If unsure, say N.
+config USB_G_MTP
+ tristate "Media Transfer Protocol (MTP) Gadget"
+ help
+ The Media Transfer Protocol gadget provides support for MTP,
+ which is used to transfer different types of media files
+ (music, pictures, movies) to/from multimedia devices like
+ digital cameras or multimedia players.
+
+ Say "y" to link the driver statically, or "m" to build a
+ dynamically linked module called "g_mtp".
+
config USB_G_MULTI
tristate "Multifunction Composite Gadget (EXPERIMENTAL)"
depends on BLOCK && NET
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 43b51da..eae8f2d 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -44,6 +44,7 @@ g_printer-objs := printer.o
g_cdc-objs := cdc2.o
g_multi-objs := multi.o
g_nokia-objs := nokia.o
+g_mtp-objs := mtp.o
obj-$(CONFIG_USB_ZERO) += g_zero.o
obj-$(CONFIG_USB_AUDIO) += g_audio.o
@@ -57,4 +58,5 @@ obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o
obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o
obj-$(CONFIG_USB_G_MULTI) += g_multi.o
obj-$(CONFIG_USB_G_NOKIA) += g_nokia.o
+obj-$(CONFIG_USB_G_MTP) += g_mtp.o
diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c
new file mode 100644
index 0000000..c70872f
--- /dev/null
+++ b/drivers/usb/gadget/f_mtp.c
@@ -0,0 +1,869 @@
+/*
+ * f_mtp.c -- USB MTP Function Driver
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation
+ * Contact: Roger Quadros <roger.quadros at nokia.com>
+ *
+ * Based on f_obex.c by Felipe Balbi
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/utsname.h>
+#include <linux/uaccess.h>
+#include <linux/ioctl.h>
+#include <linux/usb/ptp.h>
+#include "u_char.h"
+#include "gadget_chips.h"
+
+struct mtp_ep_desc {
+ struct usb_endpoint_descriptor *mtp_in;
+ struct usb_endpoint_descriptor *mtp_out;
+ struct usb_endpoint_descriptor *mtp_int;
+};
+
+#define MAX_STATUS_DATA_SIZE (PTP_MAX_STATUS_SIZE - 4)
+/* device status cache */
+struct device_status {
+ u16 length;
+ u16 code;
+ u8 data[MAX_STATUS_DATA_SIZE];
+};
+
+struct f_mtp {
+ struct gchar gc;
+ struct usb_composite_dev *cdev;
+ u8 ctrl_id;
+ u8 mtp_id;
+ u8 minor;
+ u8 connected;
+ struct device_status dev_status;
+ spinlock_t lock;
+
+ struct mtp_ep_desc fs;
+ struct mtp_ep_desc hs;
+
+ struct usb_ep *notify;
+ struct usb_endpoint_descriptor *notify_desc;
+
+ int usb_speed;
+};
+
+/*-------------------------------------------------------------------------*/
+
+static inline struct f_mtp *func_to_mtp(struct usb_function *f)
+{
+ return container_of(f, struct f_mtp, gc.func);
+}
+
+static inline struct f_mtp *gchar_to_mtp(struct gchar *p)
+{
+ return container_of(p, struct f_mtp, gc);
+}
+
+/*
+ * USB String Descriptors
+ */
+
+static struct usb_string mtp_string_defs[] = {
+ { 0, "MTP" ,},
+ { /* ZEROES END LIST */ },
+};
+
+static struct usb_gadget_strings mtp_string_table = {
+ .language = 0x0409, /* en-US */
+ .strings = mtp_string_defs,
+};
+
+static struct usb_gadget_strings *mtp_strings[] = {
+ &mtp_string_table,
+ NULL,
+};
+
+/*
+ * USB Interface Descriptors
+ */
+
+static struct usb_interface_descriptor mtp_intf __initdata = {
+ .bLength = sizeof(mtp_intf),
+ .bDescriptorType = USB_DT_INTERFACE,
+ .bAlternateSetting = 0,
+ .bNumEndpoints = 3,
+ .bInterfaceClass = USB_CLASS_STILL_IMAGE,
+ .bInterfaceSubClass = USB_SUBCLASS_PTP,
+ .bInterfaceProtocol = USB_PROTOCOL_PTP,
+};
+
+/*
+ * USB Endpoint Descriptors
+ */
+
+/* High speed support */
+static struct usb_endpoint_descriptor mtp_ep_hs_in_desc __initdata = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_DIR_IN,
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+ .wMaxPacketSize = __constant_cpu_to_le16(PTP_HS_DATA_PKT_SIZE),
+ .bInterval = 0,
+};
+
+
+static struct usb_endpoint_descriptor mtp_ep_hs_out_desc __initdata = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_DIR_OUT,
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+ .wMaxPacketSize = __constant_cpu_to_le16(PTP_HS_DATA_PKT_SIZE),
+ .bInterval = 0,
+};
+
+
+static struct usb_endpoint_descriptor mtp_ep_hs_int_desc __initdata = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_DIR_IN,
+ .bmAttributes = USB_ENDPOINT_XFER_INT,
+ .wMaxPacketSize = __constant_cpu_to_le16(PTP_HS_EVENT_PKT_SIZE),
+ .bInterval = 12,
+};
+
+static struct usb_descriptor_header *mtp_hs_function[] __initdata = {
+ (struct usb_descriptor_header *) &mtp_intf,
+ (struct usb_descriptor_header *) &mtp_ep_hs_in_desc,
+ (struct usb_descriptor_header *) &mtp_ep_hs_out_desc,
+ (struct usb_descriptor_header *) &mtp_ep_hs_int_desc,
+ NULL,
+};
+
+/* Full speed support */
+static struct usb_endpoint_descriptor mtp_ep_fs_in_desc __initdata = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_DIR_IN,
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+ .wMaxPacketSize = __constant_cpu_to_le16(PTP_FS_DATA_PKT_SIZE),
+ .bInterval = 0,
+};
+
+static struct usb_endpoint_descriptor mtp_ep_fs_out_desc __initdata = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_DIR_OUT,
+ .bmAttributes = USB_ENDPOINT_XFER_BULK,
+ .wMaxPacketSize = __constant_cpu_to_le16(PTP_FS_DATA_PKT_SIZE),
+ .bInterval = 0,
+};
+
+static struct usb_endpoint_descriptor mtp_ep_fs_int_desc __initdata = {
+ .bLength = USB_DT_ENDPOINT_SIZE,
+ .bDescriptorType = USB_DT_ENDPOINT,
+ .bEndpointAddress = USB_DIR_IN,
+ .bmAttributes = USB_ENDPOINT_XFER_INT,
+ .wMaxPacketSize = __constant_cpu_to_le16(PTP_FS_EVENT_PKT_SIZE),
+ .bInterval = 255,
+};
+
+static struct usb_descriptor_header *mtp_fs_function[] __initdata = {
+ (struct usb_descriptor_header *) &mtp_intf,
+ (struct usb_descriptor_header *) &mtp_ep_fs_in_desc,
+ (struct usb_descriptor_header *) &mtp_ep_fs_out_desc,
+ (struct usb_descriptor_header *) &mtp_ep_fs_int_desc,
+ NULL,
+};
+
+/**
+ * This function will be called when the request on the interrupt
+ * end point being used for class specific events is completed.
+ * Notes -
+ * The protocol does not give any specifications about what needs
+ * should be done in such case.
+ * Revisit if there is more information.
+ */
+static void
+mtp_notify_complete(struct usb_ep *ep, struct usb_request *req)
+{
+ struct f_mtp *mtp = req->context;
+ struct usb_composite_dev *cdev = mtp->cdev;
+
+ VDBG(cdev, "%s:\n", __func__);
+
+ switch (req->status) {
+ case 0:
+ /* normal completionn */
+ break;
+
+ case -ESHUTDOWN:
+ /* disconnect */
+ WARNING(cdev, "%s: %s shutdown\n", __func__, ep->name);
+ break;
+
+ default:
+ WARNING(cdev, "%s: unexpected %s status %d\n",
+ __func__, ep->name, req->status);
+ break;
+ }
+
+ kfree(req->buf);
+ usb_ep_free_request(ep, req);
+ return;
+}
+
+/**
+ * build_device_status() - prepares the device status response
+ *
+ * @mtp: the f_mtp struct
+ * @buf: buffer to build the response data into
+ * @buf_len: length of buffer in bytes
+ *
+ * uses spinlock mtp->lock
+ *
+ * returns number of bytes copied.
+ */
+static int build_device_status(struct f_mtp *mtp, void *buf, size_t buf_len)
+{
+ int copied, len;
+ __le16 *ptr = buf;
+ struct device_status *status = &mtp->dev_status;
+
+ spin_lock_irq(&mtp->lock);
+ len = status->length;
+ if (len > buf_len) {
+ WARNING(mtp->cdev, "%s Insufficient buffer for dev_status\n",
+ __func__);
+ /* limit status data to available buffer */
+ len = buf_len;
+ }
+
+ *ptr++ = cpu_to_le16(len);
+ *ptr++ = cpu_to_le16(status->code);
+ copied = 4;
+
+ if (len > 4) {
+ len -= 4;
+ if (len > MAX_STATUS_DATA_SIZE) {
+ len = MAX_STATUS_DATA_SIZE;
+ WARNING(mtp->cdev, "%s limited status to %d bytes\n",
+ __func__, len);
+ }
+ memcpy(ptr, status->data, len);
+ copied += len;
+ }
+ spin_unlock_irq(&mtp->lock);
+ return copied;
+}
+
+/**
+ * cache_device_status() - saves the device status to struct f_mtp
+ *
+ * @mtp: the f_mtp struct
+ * @length: length of PTP device status
+ * @code: code of PTP device status
+ * @buf: user space buffer pointing to PTP device status container
+ *
+ * uses spinlock mtp->lock
+ *
+ * returns 0 on success. negative on error
+ */
+static int cache_device_status(struct f_mtp *mtp,
+ u16 length, u16 code, const void __user *buf)
+{
+ u8 *uninitialized_var(tmp_data);
+
+ if (length > 4) {
+ if (!buf) {
+ WARNING(mtp->cdev, "%s No data buffer provided\n",
+ __func__);
+ return -EINVAL;
+ }
+
+ length -= 4; /* get length of data section */
+ if (length > MAX_STATUS_DATA_SIZE) {
+ length = MAX_STATUS_DATA_SIZE;
+ WARNING(mtp->cdev, "%s limited status data to %d "
+ "bytes\n", __func__, length);
+ }
+
+ tmp_data = kmalloc(length, GFP_KERNEL);
+ if (!tmp_data)
+ return -ENOMEM;
+
+ /* 4 bytes are for header, leave them out */
+ if (copy_from_user(tmp_data, buf + 4, length)) {
+ ERROR(mtp->cdev, "%s copy_from_user fault\n", __func__);
+ kfree(tmp_data);
+ return -EFAULT;
+ }
+ length += 4; /* undo the previous minus */
+ }
+
+ spin_lock_irq(&mtp->lock);
+ if (length > 4) {
+ memcpy(mtp->dev_status.data, tmp_data, length - 4);
+ kfree(tmp_data);
+ }
+ mtp->dev_status.length = length;
+ mtp->dev_status.code = code;
+ spin_unlock_irq(&mtp->lock);
+ return 0;
+}
+
+/**
+ * Handle the MTP specific setup requests
+ */
+static int
+mtp_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
+{
+ struct f_mtp *mtp = func_to_mtp(f);
+ struct usb_composite_dev *cdev = f->config->cdev;
+ struct usb_request *req = cdev->req;
+
+ int value = -EOPNOTSUPP;
+ u16 wIndex = le16_to_cpu(ctrl->wIndex);
+ u16 wValue = le16_to_cpu(ctrl->wValue);
+ u16 wLength = le16_to_cpu(ctrl->wLength);
+
+ switch (ctrl->bRequest) {
+ case PTP_REQ_GET_EXTENDED_EVENT_DATA:
+ /* FIXME need to implement
+ * Maybe we could have an IOCTL to save the extended event
+ * data with the driver and then send it to host whenever
+ * we get this request
+ */
+ WARNING(cdev, "%s: FIXME: PTP request GET_EXTENDED_EVENT_DATA, "
+ "not implemented\n", __func__);
+ break;
+
+ case PTP_REQ_CANCEL:
+ DBG(cdev, "%s: PTP: CANCEL\n", __func__);
+ if (ctrl->bRequestType != (USB_DIR_OUT |
+ USB_TYPE_CLASS | USB_RECIP_INTERFACE))
+ goto stall;
+
+ if (wValue != 0 || wIndex != 0 || wLength != 6)
+ goto stall;
+
+ /* FIXME need to notify user space stack */
+
+ /* we don't support CANCEL so stall */
+ break;
+
+ case PTP_REQ_DEVICE_RESET:
+ DBG(cdev, "%s: PTP: DEVICE_RESET\n", __func__);
+ if (ctrl->bRequestType != (USB_DIR_OUT |
+ USB_TYPE_CLASS | USB_RECIP_INTERFACE))
+ goto stall;
+
+ if (wValue != 0 || wIndex != 0 || wLength != 0)
+ goto stall;
+
+ /* FIXME need to notify user space stack */
+
+ /* we don't support RESET so stall */
+ break;
+
+ case PTP_REQ_GET_DEVICE_STATUS:
+ /* return the cached device status */
+ DBG(cdev, "%s: PTP: GET_DEVICE_STATUS\n", __func__);
+
+ if (ctrl->bRequestType != (USB_DIR_IN |
+ USB_TYPE_CLASS | USB_RECIP_INTERFACE)) {
+ goto stall;
+ }
+
+ if (wValue != 0 || wIndex != 0)
+ goto stall;
+
+ value = build_device_status(mtp, req->buf,
+ USB_BUFSIZ); /* composite.c */
+
+ if (value < 0) {
+ ERROR(cdev, "%s: error building device status\n",
+ __func__);
+ goto stall;
+ }
+ value = min(wLength, (u16)value);
+ break;
+
+ /* TBD: other response codes */
+ default:
+ WARNING(cdev,
+ "%s: FIXME, got PTP request 0x%x, not implemented\n",
+ __func__, ctrl->bRequest);
+ break;
+ }
+
+ /* data phase of control transfer */
+ if (value >= 0) {
+ req->length = value;
+ req->zero = value < wLength;
+ value = usb_ep_queue(cdev->gadget->ep0,
+ req, GFP_ATOMIC);
+ if (value < 0) {
+ DBG(cdev, "%s: ep_queue --> %d\n", __func__, value);
+ req->status = 0;
+ }
+ }
+
+stall:
+ /* device either stalls (value < 0) or reports success */
+ return value;
+}
+
+static long
+mtp_ioctl(struct gchar *gc, unsigned int cmd, unsigned long arg)
+{
+ int status;
+ struct f_mtp *mtp = gchar_to_mtp(gc);
+ struct usb_composite_dev *cdev = mtp->cdev;
+ int packet_size;
+ struct usb_request *notify_req;
+ void *event_packet;
+ u32 event_packet_len;
+ struct ptp_device_status_data ptp_status;
+
+ switch (cmd) {
+ case MTP_IOCTL_WRITE_ON_INTERRUPT_EP:
+
+ /* get size of packet */
+ if (copy_from_user(&event_packet_len,
+ (void __user *)arg, 4))
+ return -EFAULT;
+
+ event_packet_len = le32_to_cpu(event_packet_len);
+ if (event_packet_len > mtp->notify->maxpacket) {
+ ERROR(cdev, "%s Max event packet limit exceeded\n",
+ __func__);
+ return -EFAULT;
+ }
+
+ event_packet = kmalloc(event_packet_len, GFP_KERNEL);
+ if (!event_packet) {
+ ERROR(cdev, "%s cannot allocate memory for event\n",
+ __func__);
+ return -ENOMEM;
+ }
+
+ /* read full packet */
+ if (copy_from_user(event_packet,
+ (void __user *)arg, event_packet_len)) {
+ kfree(event_packet);
+ return -EFAULT;
+ }
+
+ /* Allocate request object to be used with this endpoint. */
+ notify_req = usb_ep_alloc_request(mtp->notify, GFP_KERNEL);
+ if (!notify_req) {
+ ERROR(cdev,
+ "%s: could not allocate notify EP request\n",
+ __func__);
+ kfree(event_packet);
+ return -ENOMEM;
+ }
+
+ notify_req->buf = event_packet;
+ notify_req->context = mtp;
+ notify_req->complete = mtp_notify_complete;
+ notify_req->length = event_packet_len;
+ if (unlikely(event_packet_len == mtp->notify->maxpacket))
+ notify_req->zero = 1;
+ else
+ notify_req->zero = 0;
+
+
+ status = usb_ep_queue(mtp->notify, notify_req, GFP_ATOMIC);
+ if (status) {
+ ERROR(cdev,
+ "%s: EVENT packet could not be queued %d\n",
+ __func__, status);
+ usb_ep_free_request(mtp->notify, notify_req);
+ kfree(event_packet);
+ return status;
+ }
+ return 0;
+
+ case MTP_IOCTL_GET_MAX_DATAPKT_SIZE:
+ switch (mtp->usb_speed) {
+ case USB_SPEED_LOW:
+ case USB_SPEED_FULL:
+ packet_size = PTP_FS_DATA_PKT_SIZE;
+ break;
+
+ case USB_SPEED_HIGH:
+ case USB_SPEED_VARIABLE:
+ packet_size = PTP_HS_DATA_PKT_SIZE;
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ status = put_user(packet_size, (int *)arg);
+ if (status) {
+ ERROR(cdev,
+ "%s: could not send max data packet size\n",
+ __func__);
+ return -EFAULT;
+ }
+ return 0;
+
+ case MTP_IOCTL_GET_MAX_EVENTPKT_SIZE:
+ switch (mtp->usb_speed) {
+ case USB_SPEED_LOW:
+ case USB_SPEED_FULL:
+ packet_size = PTP_FS_EVENT_PKT_SIZE;
+ break;
+
+ case USB_SPEED_HIGH:
+ case USB_SPEED_VARIABLE:
+ packet_size = PTP_HS_EVENT_PKT_SIZE;
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ status = put_user(packet_size, (int *)arg);
+ if (status) {
+ ERROR(cdev,
+ "%s: couldn't send max event packet size\n",
+ __func__);
+ return -EFAULT;
+ }
+ return 0;
+
+ case MTP_IOCTL_SET_DEVICE_STATUS:
+ if (copy_from_user(&ptp_status, (const void __user *)arg,
+ sizeof(ptp_status)))
+ return -EFAULT;
+
+ status = cache_device_status(mtp,
+ __le16_to_cpu(ptp_status.wLength),
+ __le16_to_cpu(ptp_status.Code),
+ (const void __user *)(arg));
+ return status;
+
+ default:
+ WARNING(cdev, "%s: unhandled IOCTL %d\n", __func__, cmd);
+ return -EINVAL;
+ }
+}
+
+static void
+mtp_disconnect(struct gchar *gc)
+{
+ struct f_mtp *mtp = gchar_to_mtp(gc);
+ struct usb_composite_dev *cdev = mtp->cdev;
+ int status = 0;
+
+ if (!mtp->connected)
+ return;
+
+ status = usb_function_deactivate(&gc->func);
+ if (status) {
+ WARNING(cdev, "%s: could not deactivate mtp function %d, "
+ "status: %d\n", __func__, mtp->minor, status);
+ } else {
+ mtp->connected = false;
+ INFO(cdev, "mtp function %d disconnected\n", mtp->minor);
+ }
+}
+
+static void mtp_connect(struct gchar *gc)
+{
+ struct f_mtp *mtp = gchar_to_mtp(gc);
+ struct usb_composite_dev *cdev = mtp->cdev;
+ int status = 0;
+
+ if (mtp->connected)
+ return;
+
+ status = usb_function_activate(&gc->func);
+ if (status) {
+ WARNING(cdev, "%s: could not activate mtp function %d, "
+ "status: %d\n", __func__, mtp->minor, status);
+ } else {
+ mtp->connected = true;
+ INFO(cdev, "mtp function %d connected\n", mtp->minor);
+ }
+}
+
+/**
+ * Set alt-settings of the interface.
+ * When connected with host, this function will get called for the
+ * number of interfaces defined for this gadget.
+ * This function enables all the required end points.
+ */
+static int
+mtp_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
+{
+ struct usb_composite_dev *cdev = f->config->cdev;
+ struct f_mtp *mtp = func_to_mtp(f);
+ int status = -1;
+
+ if (intf != mtp->mtp_id)
+ return -EINVAL;
+
+ if (alt != 0) {
+ WARNING(cdev, "%s: invalid setting\n", __func__);
+ return -EINVAL;
+ }
+
+ /* Handle interrupt endpoint */
+ if (mtp->notify->driver_data) {
+ DBG(cdev, "%s: notify reset mtp control %d\n", __func__, intf);
+ usb_ep_disable(mtp->notify);
+ } else {
+ DBG(cdev, "%s: notify init mtp ctrl %d\n", __func__, intf);
+ mtp->notify_desc = ep_choose(cdev->gadget,
+ mtp->hs.mtp_int,
+ mtp->fs.mtp_int);
+ }
+
+ status = usb_ep_enable(mtp->notify, mtp->notify_desc);
+ if (status != 0)
+ ERROR(cdev, "%s: Error enabling endpoint\n", __func__);
+ mtp->notify->driver_data = mtp;
+
+ if (mtp->gc.ep_in->driver_data) {
+ /* Altsetting 0 for an interface that already has 0 altset,
+ * ignore this
+ */
+ return 0;
+ }
+
+ if (!mtp->gc.ep_in_desc) {
+ DBG(cdev, "%s: init mtp %d\n", __func__, mtp->minor);
+ mtp->gc.ep_in_desc = ep_choose(cdev->gadget,
+ mtp->hs.mtp_in,
+ mtp->fs.mtp_in);
+ mtp->gc.ep_out_desc = ep_choose(cdev->gadget,
+ mtp->hs.mtp_out,
+ mtp->fs.mtp_out);
+ }
+
+ DBG(cdev, "%s: mtp %d enable\n", __func__, mtp->minor);
+ status = gchar_connect(&mtp->gc, mtp->minor, f->name);
+ if (status) {
+ ERROR(cdev,
+ "%s: gchar_connect() failed %d\n", __func__, status);
+ return status;
+ }
+
+ /* Get the USB speed */
+ mtp->usb_speed = cdev->gadget->speed;
+ return 0;
+}
+
+static void
+mtp_disable(struct usb_function *f)
+{
+ struct f_mtp *mtp = func_to_mtp(f);
+ struct usb_composite_dev *cdev = f->config->cdev;
+
+ DBG(cdev, "%s: mtp %d disable\n", __func__, mtp->minor);
+ /* disable OUT/IN endpoints */
+ gchar_disconnect(&mtp->gc);
+ /* disable INT endpoint */
+ if (mtp->notify->driver_data) {
+ usb_ep_disable(mtp->notify);
+ mtp->notify->driver_data = NULL;
+ mtp->notify_desc = NULL;
+ }
+ mtp->usb_speed = -1;
+}
+
+static int
+__init mtp_bind(struct usb_configuration *c, struct usb_function *f)
+{
+ struct f_mtp *mtp = func_to_mtp(f);
+ struct usb_composite_dev *cdev = c->cdev;
+ int status;
+ struct usb_ep *ep = NULL;
+
+ /* allocate instance-specific interface IDs and patch up descriptors */
+ /* We have only ONE MTP interface. So get the unused interface ID for
+ * this interface.*/
+ status = usb_interface_id(c, f);
+ if (status < 0)
+ return status;
+ mtp->mtp_id = status;
+ mtp_intf.bInterfaceNumber = status;
+
+ status = -ENOMEM;
+ /* Allocate the endpoints */
+ /* mtp_ep_fs_in_desc */
+ ep = usb_ep_autoconfig(cdev->gadget, &mtp_ep_fs_in_desc);
+ if (!ep)
+ goto fail;
+ mtp->gc.ep_in = ep;
+ ep->driver_data = cdev;
+
+ /* mtp_ep_fs_out_desc */
+ ep = usb_ep_autoconfig(cdev->gadget, &mtp_ep_fs_out_desc);
+ if (!ep)
+ goto fail;
+ mtp->gc.ep_out = ep;
+ ep->driver_data = cdev;
+
+ /* mtp_ep_fs_int_desc */
+ ep = usb_ep_autoconfig(cdev->gadget, &mtp_ep_fs_int_desc);
+ if (!ep)
+ goto fail;
+ mtp->notify = ep;
+ ep->driver_data = cdev;
+
+
+ /* copy descriptors, and track endpoint copies */
+ f->descriptors = usb_copy_descriptors(mtp_fs_function);
+ mtp->fs.mtp_in = usb_find_endpoint(mtp_fs_function,
+ f->descriptors, &mtp_ep_fs_in_desc);
+ mtp->fs.mtp_out = usb_find_endpoint(mtp_fs_function,
+ f->descriptors, &mtp_ep_fs_out_desc);
+ mtp->fs.mtp_int = usb_find_endpoint(mtp_fs_function,
+ f->descriptors, &mtp_ep_fs_int_desc);
+
+ /* support all relevant hardware speeds... we expect that when
+ * hardware is dual speed, all bulk-capable endpoints work at
+ * both speeds
+ */
+ if (gadget_is_dualspeed(c->cdev->gadget)) {
+ /* Copy endpoint address */
+ mtp_ep_hs_in_desc.bEndpointAddress =
+ mtp_ep_fs_in_desc.bEndpointAddress;
+ mtp_ep_hs_out_desc.bEndpointAddress =
+ mtp_ep_fs_out_desc.bEndpointAddress;
+ mtp_ep_hs_int_desc.bEndpointAddress =
+ mtp_ep_fs_int_desc.bEndpointAddress;
+
+ /* Copy descriptors, and track endpoint copies */
+ f->hs_descriptors = usb_copy_descriptors(mtp_hs_function);
+ mtp->hs.mtp_in = usb_find_endpoint(mtp_hs_function,
+ f->hs_descriptors, &mtp_ep_hs_in_desc);
+ mtp->hs.mtp_out = usb_find_endpoint(mtp_hs_function,
+ f->hs_descriptors, &mtp_ep_hs_out_desc);
+ mtp->hs.mtp_int = usb_find_endpoint(mtp_hs_function,
+ f->hs_descriptors, &mtp_ep_hs_int_desc);
+ }
+
+ /* Prevent enumeration until someone opens
+ * the port from the user space */
+ status = usb_function_deactivate(f);
+ if (status < 0) {
+ WARNING(cdev, "%s: mtp %d: can't prevent enumeration, %d\n",
+ __func__, mtp->minor, status);
+ mtp->connected = true;
+ }
+
+
+ INFO(cdev, "mtp %d: %s speed IN/%s OUT/%s INT/%s\n",
+ mtp->minor,
+ gadget_is_dualspeed(cdev->gadget) ? "dual" : "full",
+ mtp->gc.ep_in->name, mtp->gc.ep_out->name,
+ mtp->notify->name);
+
+ return 0;
+fail:
+ if (mtp->gc.ep_out)
+ mtp->gc.ep_out->driver_data = NULL;
+
+ if (mtp->gc.ep_in)
+ mtp->gc.ep_in->driver_data = NULL;
+
+ if (mtp->notify)
+ mtp->notify->driver_data = NULL;
+
+ ERROR(cdev, "%s/%p: cant bind, err %d\n", f->name, f, status);
+
+ return status;
+}
+
+static void
+mtp_unbind(struct usb_configuration *c, struct usb_function *f)
+{
+ struct f_mtp *mtp = func_to_mtp(f);
+
+ if (gadget_is_dualspeed(c->cdev->gadget))
+ usb_free_descriptors(f->hs_descriptors);
+
+ usb_free_descriptors(f->descriptors);
+ kfree(mtp);
+}
+
+/**
+ * mtp_bind_config - add a MTP function to a configuration
+ * @c: the configuration to support MTP
+ * @port_num: /dev/ttyGS* port this interface will use
+ * Context: single threaded during gadget setup
+ *
+ * Returns zero on success, else negative errno.
+ *
+ * Caller must have called @gchar_setup() with enough devices to
+ * handle all the ones it binds. Caller is also responsible
+ * for calling @gchar_cleanup() before module unload.
+ */
+int
+__init mtp_bind_config(struct usb_configuration *c, u8 minor)
+{
+ struct f_mtp *mtp = NULL;
+ int status = 0;
+
+ /* allocate device global string IDs and patch descriptors*/
+ if (mtp_string_defs[0].id == 0) {
+ status = usb_string_id(c->cdev);
+ if (status < 0)
+ return status;
+ mtp_string_defs[0].id = status;
+ mtp_intf.iInterface = status;
+ }
+
+ /* allocate and initialize one new instance */
+ mtp = kzalloc(sizeof(*mtp), GFP_KERNEL);
+ if (!mtp)
+ return -ENOMEM;
+
+ spin_lock_init(&mtp->lock);
+
+ mtp->minor = minor;
+
+ mtp->gc.func.name = "MTP";
+ mtp->gc.func.strings = mtp_strings;
+
+ mtp->gc.open = mtp_connect;
+ mtp->gc.close = mtp_disconnect;
+ mtp->gc.ioctl = mtp_ioctl;
+
+ mtp->gc.func.bind = mtp_bind;
+ mtp->gc.func.unbind = mtp_unbind;
+ mtp->gc.func.set_alt = mtp_set_alt;
+ mtp->gc.func.setup = mtp_setup;
+ mtp->gc.func.disable = mtp_disable;
+
+ mtp->usb_speed = -1; /* invalid speed */
+
+ mtp->cdev = c->cdev;
+
+ /* default device status is BUSY */
+ cache_device_status(mtp, 4, PTP_RC_DEVICE_BUSY, 0);
+
+ status = usb_add_function(c, &mtp->gc.func);
+ if (status) {
+ kfree(mtp);
+ }
+
+ return status;
+}
diff --git a/drivers/usb/gadget/mtp.c b/drivers/usb/gadget/mtp.c
new file mode 100644
index 0000000..b0cea2f
--- /dev/null
+++ b/drivers/usb/gadget/mtp.c
@@ -0,0 +1,249 @@
+/*
+ * mtp.c -- Media Transfer Protocol USB Gadget Driver
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation
+ * Contact: Yauheni Kaliuta <yauheni.kaliuta@xxxxxxxxx>
+ *
+ * This gadget driver borrows from serial.c which is:
+ *
+ * Copyright (C) 2003 Al Borchers (alborchers@xxxxxxxxxxxxxxxx)
+ * Copyright (C) 2008 by David Brownell
+ * Copyright (C) 2008 by Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/utsname.h>
+#include <linux/device.h>
+
+#include <linux/usb/composite.h>
+#include "u_char.h"
+#include "gadget_chips.h"
+
+/*-------------------------------------------------------------------------*/
+
+/*
+ * Kbuild is not very cooperative with respect to linking separately
+ * compiled library objects into one module. So for now we won't use
+ * separate compilation ... ensuring init/exit sections work to shrink
+ * the runtime footprint, and giving us at least some parts of what
+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
+ */
+#include "composite.c"
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+
+#include "f_mtp.c"
+#include "u_char.c"
+
+/*-------------------------------------------------------------------------*/
+
+#define MTP_VERSION_NUM 0x1000
+#define MTP_VERSION_STR "1.0"
+
+#define MTP_VENDOR_ID 0x0101
+#define MTP_PRODUCT_ID 0x0202
+
+#define MTP_DRIVER_DESC "MTP Gadget"
+
+/* string IDs are assigned dynamically */
+
+#define STRING_MANUFACTURER_IDX 0
+#define STRING_PRODUCT_IDX 1
+#define STRING_DESCRIPTION_IDX 2
+
+static char manufacturer[50];
+
+static struct usb_string strings_dev[] = {
+ [STRING_MANUFACTURER_IDX].s = manufacturer,
+ [STRING_PRODUCT_IDX].s = MTP_DRIVER_DESC,
+ [STRING_DESCRIPTION_IDX].s = MTP_DRIVER_DESC,
+ { } /* end of list */
+};
+
+static struct usb_gadget_strings stringtab_dev = {
+ .language = 0x0409, /* en-us */
+ .strings = strings_dev,
+};
+
+static struct usb_gadget_strings *dev_strings[] = {
+ &stringtab_dev,
+ NULL,
+};
+
+static struct usb_device_descriptor device_desc = {
+ .bLength = USB_DT_DEVICE_SIZE,
+ .bDescriptorType = USB_DT_DEVICE,
+ .bcdUSB = cpu_to_le16(0x0200),
+ .bDeviceClass = USB_CLASS_PER_INTERFACE,
+ .bDeviceSubClass = 0,
+ .bDeviceProtocol = 0,
+ /* .bMaxPacketSize0 = f(hardware) */
+ .idVendor = cpu_to_le16(MTP_VENDOR_ID),
+ .idProduct = cpu_to_le16(MTP_PRODUCT_ID),
+ /* .bcdDevice = f(hardware) */
+ /* .iManufacturer = DYNAMIC */
+ /* .iProduct = DYNAMIC */
+ .bNumConfigurations = 1,
+};
+
+static struct usb_otg_descriptor otg_descriptor = {
+ .bLength = sizeof otg_descriptor,
+ .bDescriptorType = USB_DT_OTG,
+
+ /* REVISIT SRP-only hardware is possible, although
+ * it would not be called "OTG" ...
+ */
+ .bmAttributes = USB_OTG_SRP | USB_OTG_HNP,
+};
+
+static const struct usb_descriptor_header *otg_desc[] = {
+ (struct usb_descriptor_header *) &otg_descriptor,
+ NULL,
+};
+
+/*-------------------------------------------------------------------------*/
+
+/* Module */
+MODULE_DESCRIPTION(MTP_DRIVER_DESC);
+MODULE_AUTHOR("Yauheni Kaliuta");
+MODULE_LICENSE("GPL");
+
+/*-------------------------------------------------------------------------*/
+
+static int __init g_mtp_bind_config(struct usb_configuration *c)
+{
+ int status;
+
+ status = mtp_bind_config(c, 0);
+ if (status)
+ printk(KERN_DEBUG "could not bind mtp config\n");
+
+ return status;
+}
+
+static struct usb_configuration mtp_config_driver = {
+ /* .label = f(use_acm) */
+ .bind = g_mtp_bind_config,
+ .bConfigurationValue = 1,
+ /* .iConfiguration = DYNAMIC */
+ .bmAttributes = USB_CONFIG_ATT_SELFPOWER,
+};
+
+static int __init g_mtp_bind(struct usb_composite_dev *cdev)
+{
+ int gcnum;
+ struct usb_gadget *gadget = cdev->gadget;
+ int status;
+
+ status = gchar_setup(cdev->gadget, 1);
+ if (status < 0)
+ return status;
+
+ /* Allocate string descriptor numbers ... note that string
+ * contents can be overridden by the composite_dev glue.
+ */
+
+ /* device description: manufacturer, product */
+ snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",
+ init_utsname()->sysname, init_utsname()->release,
+ gadget->name);
+ status = usb_string_id(cdev);
+ if (status < 0)
+ goto fail;
+ strings_dev[STRING_MANUFACTURER_IDX].id = status;
+
+ device_desc.iManufacturer = status;
+
+ status = usb_string_id(cdev);
+ if (status < 0)
+ goto fail;
+ strings_dev[STRING_PRODUCT_IDX].id = status;
+
+ device_desc.iProduct = status;
+
+ /* config description */
+ status = usb_string_id(cdev);
+ if (status < 0)
+ goto fail;
+ strings_dev[STRING_DESCRIPTION_IDX].id = status;
+
+ mtp_config_driver.iConfiguration = status;
+
+ /* set up other descriptors */
+ gcnum = usb_gadget_controller_number(gadget);
+ if (gcnum >= 0)
+ device_desc.bcdDevice = cpu_to_le16(MTP_VERSION_NUM | gcnum);
+ else {
+ /* this is so simple (for now, no altsettings) that it
+ * SHOULD NOT have problems with bulk-capable hardware.
+ * so warn about unrecognized controllers -- don't panic.
+ *
+ * things like configuration and altsetting numbering
+ * can need hardware-specific attention though.
+ */
+ WARNING(cdev, "g_mtp_bind: controller '%s' not recognized\n",
+ gadget->name);
+ device_desc.bcdDevice =
+ cpu_to_le16(MTP_VERSION_NUM | 0x0099);
+ }
+
+ if (gadget_is_otg(cdev->gadget)) {
+ mtp_config_driver.descriptors = otg_desc;
+ mtp_config_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+ }
+
+ /* register our configuration */
+ status = usb_add_config(cdev, &mtp_config_driver);
+ if (status < 0)
+ goto fail;
+
+ DBG(cdev, "%s, version: " MTP_VERSION_STR "\n",
+ MTP_DRIVER_DESC);
+
+ return 0;
+
+fail:
+ gchar_cleanup();
+ return status;
+}
+
+static int __exit g_mtp_unbind(struct usb_composite_dev *cdev)
+{
+ gchar_cleanup();
+ return 0;
+}
+
+static struct usb_composite_driver gmtp_driver = {
+ .name = "g_mtp",
+ .dev = &device_desc,
+ .strings = dev_strings,
+ .bind = g_mtp_bind,
+ .unbind = __exit_p(g_mtp_unbind),
+};
+
+static int __init init(void)
+{
+ return usb_composite_register(&gmtp_driver);
+}
+module_init(init);
+
+static void __exit cleanup(void)
+{
+ usb_composite_unregister(&gmtp_driver);
+}
+module_exit(cleanup);
diff --git a/include/linux/usb/ptp.h b/include/linux/usb/ptp.h
new file mode 100644
index 0000000..dd14ab1
--- /dev/null
+++ b/include/linux/usb/ptp.h
@@ -0,0 +1,105 @@
+/*
+ * ptp.h -- Picture Transfer Protocol definitions
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __LINUX_USB_PTP_H
+#define __LINUX_USB_PTP_H
+
+/* device or driver specific */
+#define PTP_HS_DATA_PKT_SIZE 512
+#define PTP_HS_EVENT_PKT_SIZE 64
+
+#define PTP_FS_DATA_PKT_SIZE 64
+#define PTP_FS_EVENT_PKT_SIZE 64
+
+#define PTP_PACKET_LENGTH 16
+#define PTP_MAX_STATUS_SIZE 64
+
+/* PTP USB Class codes */
+#define USB_SUBCLASS_PTP 1
+#define USB_PROTOCOL_PTP 1
+
+/* PTP Response Codes */
+
+#define PTP_RC_OK 0x2001
+#define PTP_RC_DEVICE_BUSY 0x2019
+#define PTP_RC_TRANSACTION_CANCELLED 0x201F
+
+/**
+ * PTP class specific requests
+ */
+#define PTP_REQ_CANCEL 0x64
+#define PTP_REQ_GET_EXTENDED_EVENT_DATA 0x65
+#define PTP_REQ_DEVICE_RESET 0x66
+#define PTP_REQ_GET_DEVICE_STATUS 0x67
+
+struct ptp_device_status_data {
+ __le16 wLength;
+ __le16 Code;
+ __le32 Parameter1;
+ __le32 Parameter2;
+} __attribute__ ((packed));
+
+struct ptp_cancel_data {
+ __le16 CancellationCode;
+ __le32 TransactionID;
+} __attribute__ ((packed));
+
+
+/* MTP IOCTLs */
+
+#define MTP_IOCTL_BASE 0xF9
+#define MTP_IO(nr) _IO(MTP_IOCTL_BASE, nr)
+#define MTP_IOR(nr, type) _IOR(MTP_IOCTL_BASE, nr, type)
+#define MTP_IOW(nr, type) _IOW(MTP_IOCTL_BASE, nr, type)
+#define MTP_IOWR(nr, type) _IOWR(MTP_IOCTL_BASE, nr, type)
+
+
+/* MTP_IOCTL_WRITE_ON_INTERRUPT_EP
+ *
+ * Write at max 64 bytes to MTP interrupt i.e. event endpoint
+ */
+#define MTP_IOCTL_WRITE_ON_INTERRUPT_EP MTP_IOW(0, __u8[64])
+
+/* Not yet Implemented
+ *
+ * #define MTP_IOCTL_DEVICE_STATUS MTP_IOW(1, char *)
+ * #define MTP_IOCTL_CANCEL_TXN MTP_IOW(2, char *)
+ *
+ */
+
+/* MTP_IOCTL_GET_MAX_DATAPKT_SIZE
+ *
+ * Return the max packet size of Data endpoint
+ */
+#define MTP_IOCTL_GET_MAX_DATAPKT_SIZE MTP_IOR(3, __u32)
+
+/* MTP_IOCTL_GET_MAX_EVENTPKT_SIZE
+ *
+ * Return the max packet size of Event endpoing
+ */
+#define MTP_IOCTL_GET_MAX_EVENTPKT_SIZE MTP_IOR(4, __u32)
+
+/* MTP_IOCTL_SET_DEVICE_STATUS
+ *
+ * Update drivers device status cache
+ */
+#define MTP_IOCTL_SET_DEVICE_STATUS MTP_IOW(5, __u8[PTP_MAX_STATUS_SIZE])
+
+#endif /* __LINUX_USB_PTP_H */
--
1.7.0.rc0.33.g7c3932
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
