*/
-// #define DEBUG /* data to help fault diagnosis */
+#define DEBUG 1 /* data to help fault diagnosis */
// #define VERBOSE /* extra debug messages (success too) */
#include <linux/init.h>
* The gadgetfs API maps each endpoint to a file descriptor so that you
* can use standard synchronous read/write calls for I/O. There's some
* O_NONBLOCK and O_ASYNC/FASYNC style i/o support. Example usermode
- * drivers show how this works in practice. You can also use AIO to
- * eliminate I/O gaps between requests, to help when streaming data.
+ * drivers show how this works in practice.
*
* Key parts that must be USB-specific are protocols defining how the
* read/write operations relate to the hardware state machines. There
*/
#define DRIVER_DESC "USB Gadget filesystem"
-#define DRIVER_VERSION "18 Nov 2003"
+#define DRIVER_VERSION "20 Aug 2003"
static const char driver_desc [] = DRIVER_DESC;
static const char shortname [] = "gadgetfs";
dev = kmalloc (sizeof *dev, GFP_KERNEL);
if (!dev)
- return NULL;
+ return 0;
memset (dev, 0, sizeof *dev);
dev->state = STATE_DEV_DISABLED;
atomic_set (&dev->count, 1);
#define CHIP "goku_udc"
#endif
-#ifdef CONFIG_USB_GADGET_OMAP
-#define CHIP "omap_udc"
-#endif
-
#ifdef CONFIG_USB_GADGET_SA1100
#define CHIP "sa1100"
#endif
return status;
}
-/*----------------------------------------------------------------------*/
-
-/* ASYNCHRONOUS ENDPOINT I/O OPERATIONS (bulk/intr/iso) */
-
-struct kiocb_priv {
- struct usb_request *req;
- struct ep_data *epdata;
- void *buf;
- char __user *ubuf;
- unsigned actual;
-};
-
-static int ep_aio_cancel(struct kiocb *iocb, struct io_event *e)
-{
- struct kiocb_priv *priv = (void *) &iocb->private;
- struct ep_data *epdata;
- int value;
-
- local_irq_disable();
- epdata = priv->epdata;
- // spin_lock(&epdata->dev->lock);
- kiocbSetCancelled(iocb);
- if (likely(epdata && epdata->ep && priv->req))
- value = usb_ep_dequeue (epdata->ep, priv->req);
- else
- value = -EINVAL;
- // spin_unlock(&epdata->dev->lock);
- local_irq_enable();
-
- aio_put_req(iocb);
- return value;
-}
-
-static long ep_aio_read_retry(struct kiocb *iocb)
-{
- struct kiocb_priv *priv = (void *) &iocb->private;
- int status = priv->actual;
-
- /* we "retry" to get the right mm context for this: */
- status = copy_to_user(priv->ubuf, priv->buf, priv->actual);
- if (unlikely(0 != status))
- status = -EFAULT;
- else
- status = priv->actual;
- kfree(priv->buf);
- aio_put_req(iocb);
- return status;
-}
-
-static void ep_aio_complete(struct usb_ep *ep, struct usb_request *req)
-{
- struct kiocb *iocb = req->context;
- struct kiocb_priv *priv = (void *) &iocb->private;
- struct ep_data *epdata = priv->epdata;
-
- /* lock against disconnect (and ideally, cancel) */
- spin_lock(&epdata->dev->lock);
- priv->req = NULL;
- priv->epdata = NULL;
- if (NULL == iocb->ki_retry
- || unlikely(0 == req->actual)
- || unlikely(kiocbIsCancelled(iocb))) {
- kfree(req->buf);
- /* aio_complete() reports bytes-transferred _and_ faults */
- if (unlikely(kiocbIsCancelled(iocb)))
- aio_put_req(iocb);
- else
- aio_complete(iocb,
- req->actual ? req->actual : req->status,
- req->status);
- } else {
- /* retry() won't report both; so we hide some faults */
- if (unlikely(0 != req->status))
- DBG(epdata->dev, "%s fault %d len %d\n",
- ep->name, req->status, req->actual);
-
- priv->buf = req->buf;
- priv->actual = req->actual;
- kick_iocb(iocb);
- }
- spin_unlock(&epdata->dev->lock);
-
- usb_ep_free_request(ep, req);
- put_ep(epdata);
-}
-
-static ssize_t
-ep_aio_rwtail(struct kiocb *iocb, char *buf, size_t len, struct ep_data *epdata)
-{
- struct kiocb_priv *priv = (void *) &iocb->private;
- struct usb_request *req;
- ssize_t value;
-
- value = get_ready_ep(iocb->ki_filp->f_flags, epdata);
- if (unlikely(value < 0)) {
- kfree(buf);
- return value;
- }
-
- iocb->ki_cancel = ep_aio_cancel;
- get_ep(epdata);
- priv->epdata = epdata;
- priv->actual = 0;
-
- /* each kiocb is coupled to one usb_request, but we can't
- * allocate or submit those if the host disconnected.
- */
- spin_lock_irq(&epdata->dev->lock);
- if (likely(epdata->ep)) {
- req = usb_ep_alloc_request(epdata->ep, GFP_ATOMIC);
- if (likely(req)) {
- priv->req = req;
- req->buf = buf;
- req->length = len;
- req->complete = ep_aio_complete;
- req->context = iocb;
- value = usb_ep_queue(epdata->ep, req, GFP_ATOMIC);
- if (unlikely(0 != value))
- usb_ep_free_request(epdata->ep, req);
- } else
- value = -EAGAIN;
- } else
- value = -ENODEV;
- spin_unlock_irq(&epdata->dev->lock);
-
- up(&epdata->lock);
-
- if (unlikely(value))
- put_ep(epdata);
- else
- value = -EIOCBQUEUED;
- return value;
-}
-
-static ssize_t
-ep_aio_read(struct kiocb *iocb, char __user *ubuf, size_t len, loff_t o)
-{
- struct kiocb_priv *priv = (void *) &iocb->private;
- struct ep_data *epdata = iocb->ki_filp->private_data;
- char *buf;
-
- if (unlikely(epdata->desc.bEndpointAddress & USB_DIR_IN))
- return -EINVAL;
- buf = kmalloc(len, GFP_KERNEL);
- if (unlikely(!buf))
- return -ENOMEM;
- iocb->ki_retry = ep_aio_read_retry;
- priv->ubuf = ubuf;
- return ep_aio_rwtail(iocb, buf, len, epdata);
-}
-
-static ssize_t
-ep_aio_write(struct kiocb *iocb, const char __user *ubuf, size_t len, loff_t o)
-{
- struct ep_data *epdata = iocb->ki_filp->private_data;
- char *buf;
-
- if (unlikely(!(epdata->desc.bEndpointAddress & USB_DIR_IN)))
- return -EINVAL;
- buf = kmalloc(len, GFP_KERNEL);
- if (unlikely(!buf))
- return -ENOMEM;
- if (unlikely(copy_from_user(buf, ubuf, len) != 0)) {
- kfree(buf);
- return -EFAULT;
- }
- return ep_aio_rwtail(iocb, buf, len, epdata);
-}
-
-/*----------------------------------------------------------------------*/
-
/* used after endpoint configuration */
static struct file_operations ep_io_operations = {
.owner = THIS_MODULE,
.ioctl = ep_ioctl,
.release = ep_release,
- .aio_read = ep_aio_read,
- .aio_write = ep_aio_write,
+ // .aio_read = ep_aio_read,
+ // .aio_write = ep_aio_write,
};
/* ENDPOINT INITIALIZATION
* speed descriptor, then optional high speed descriptor.
*/
static ssize_t
-ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
+ep_config (struct file *fd, const char *buf, size_t len, loff_t *ptr)
{
struct ep_data *data = fd->private_data;
struct usb_ep *ep;
}
static ssize_t
-ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr)
+ep0_read (struct file *fd, char *buf, size_t len, loff_t *ptr)
{
struct dev_data *dev = fd->private_data;
ssize_t retval;
}
static ssize_t
-ep0_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
+ep0_write (struct file *fd, const char *buf, size_t len, loff_t *ptr)
{
struct dev_data *dev = fd->private_data;
ssize_t retval = -ESRCH;
fasync_helper (-1, fd, 0, &dev->fasync);
kfree (dev->buf);
- dev->buf = NULL;
+ dev->buf = 0;
put_dev (dev);
/* other endpoints were all decoupled from this device */
req->buf = dev->rbuf;
req->dma = DMA_ADDR_INVALID;
- req->context = NULL;
+ req->context = 0;
value = -EOPNOTSUPP;
switch (ctrl->bRequest) {
/* proceed with data transfer and status phases? */
if (value >= 0 && dev->state != STATE_SETUP) {
req->length = value;
- req->zero = value < ctrl->wLength
- && (value % gadget->ep0->maxpacket) == 0;
value = usb_ep_queue (gadget->ep0, req, GFP_ATOMIC);
if (value < 0) {
DBG (dev, "ep_queue --> %d\n", value);
ep = list_entry (entry, struct ep_data, epfiles);
list_del_init (&ep->epfiles);
dentry = ep->dentry;
- ep->dentry = NULL;
+ ep->dentry = 0;
parent = dentry->d_parent->d_inode;
/* break link to controller */
(void) usb_ep_disable (ep->ep);
ep->state = STATE_EP_UNBOUND;
usb_ep_free_request (ep->ep, ep->req);
- ep->ep = NULL;
+ ep->ep = 0;
wake_up (&ep->wait);
put_ep (ep);
spin_unlock_irq (&dev->lock);
destroy_ep_files (dev);
- gadget->ep0->driver_data = NULL;
- set_gadget_data (gadget, NULL);
+ gadget->ep0->driver_data = 0;
+ set_gadget_data (gadget, 0);
/* we've already been disconnected ... no i/o is active */
if (dev->req)
dev->req = usb_ep_alloc_request (gadget->ep0, GFP_KERNEL);
if (!dev->req)
goto enomem;
- dev->req->context = NULL;
+ dev->req->context = 0;
dev->req->complete = epio_complete;
if (activate_ep_files (dev) < 0)
}
static ssize_t
-dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
+dev_config (struct file *fd, const char *buf, size_t len, loff_t *ptr)
{
struct dev_data *dev = fd->private_data;
ssize_t value = len, length = len;
value = usb_gadget_register_driver (&gadgetfs_driver);
if (value != 0) {
kfree (dev->buf);
- dev->buf = NULL;
+ dev->buf = 0;
} else {
/* at this point "good" hardware has for the first time
* let the USB the host see us. alternatively, if users
spin_unlock_irq (&dev->lock);
pr_debug ("%s: %s fail %Zd, %p\n", shortname, __FUNCTION__, value, dev);
kfree (dev->buf);
- dev->buf = NULL;
+ dev->buf = 0;
return value;
}
qname.hash = full_name_hash (qname.name, qname.len);
dentry = d_alloc (sb->s_root, &qname);
if (!dentry)
- return NULL;
+ return 0;
inode = gadgetfs_make_inode (sb, data, fops,
S_IFREG | (default_perm & S_IRWXUGO));
if (!inode) {
dput(dentry);
- return NULL;
+ return 0;
}
d_add (dentry, inode);
*dentry_p = dentry;
/* root inode */
inode = gadgetfs_make_inode (sb,
- NULL, &simple_dir_operations,
+ 0, &simple_dir_operations,
S_IFDIR | S_IRUGO | S_IXUGO);
if (!inode)
return -ENOMEM;
kill_litter_super (sb);
if (the_device) {
put_dev (the_device);
- the_device = NULL;
+ the_device = 0;
}
}
git://git.onelab.eu / linux-2.6.git / blobdiff