summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-10-10 16:44:26 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-10-10 16:44:26 +0000
commit18289d868d53c24e10197fd2d5f4c250dd4bceb6 (patch)
tree6455e105df3829ce2ed3f905394b54708a67cac2
parent0b8cae2e5e68c9c76e775b946caa79809a5d0eec (diff)
downloadpx4-nuttx-18289d868d53c24e10197fd2d5f4c250dd4bceb6.tar.gz
px4-nuttx-18289d868d53c24e10197fd2d5f4c250dd4bceb6.tar.bz2
px4-nuttx-18289d868d53c24e10197fd2d5f4c250dd4bceb6.zip
cosmetic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1023 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/drivers/usbdev/usbdev_serial.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/nuttx/drivers/usbdev/usbdev_serial.c b/nuttx/drivers/usbdev/usbdev_serial.c
index 0f86007cb..cb8e9fff8 100644
--- a/nuttx/drivers/usbdev/usbdev_serial.c
+++ b/nuttx/drivers/usbdev/usbdev_serial.c
@@ -324,9 +324,9 @@ static int usbclass_setconfig(FAR struct usbser_dev_s *priv,
static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep,
FAR struct usbdev_req_s *req);
-static void usbclass_epbulkoutcomplete(FAR struct usbdev_ep_s *ep,
+static void usbclass_rdcomplete(FAR struct usbdev_ep_s *ep,
FAR struct usbdev_req_s *req);
-static void usbclass_epbulkincomplete(FAR struct usbdev_ep_s *ep,
+static void usbclass_wrcomplete(FAR struct usbdev_ep_s *ep,
FAR struct usbdev_req_s *req);
/* USB class device ********************************************************/
@@ -1079,7 +1079,7 @@ static int usbclass_setconfig(FAR struct usbser_dev_s *priv, ubyte config)
for (i = 0; i < CONFIG_USBSER_NRDREQS; i++)
{
req = priv->rdreqs[i].req;
- req->callback = usbclass_epbulkoutcomplete;
+ req->callback = usbclass_rdcomplete;
ret = EP_SUBMIT(priv->epbulkout, req);
if (ret != OK)
{
@@ -1114,14 +1114,15 @@ static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep, struct usbdev_req
}
/****************************************************************************
- * Name: usbclass_epbulkoutcomplete
+ * Name: usbclass_rdcomplete
*
* Description:
* Handle completion of read request on the bulk OUT endpoint. This
* is handled like the receipt of serial data on the "UART"
+ *
****************************************************************************/
-static void usbclass_epbulkoutcomplete(FAR struct usbdev_ep_s *ep, struct usbdev_req_s *req)
+static void usbclass_rdcomplete(FAR struct usbdev_ep_s *ep, struct usbdev_req_s *req)
{
FAR struct usbser_dev_s *priv;
irqstate_t flags;
@@ -1179,7 +1180,7 @@ static void usbclass_epbulkoutcomplete(FAR struct usbdev_ep_s *ep, struct usbdev
}
/****************************************************************************
- * Name: usbclass_epbulkincomplete
+ * Name: usbclass_wrcomplete
*
* Description:
* Handle completion of write request. This function probably executes
@@ -1187,7 +1188,7 @@ static void usbclass_epbulkoutcomplete(FAR struct usbdev_ep_s *ep, struct usbdev
*
****************************************************************************/
-static void usbclass_epbulkincomplete(FAR struct usbdev_ep_s *ep, struct usbdev_req_s *req)
+static void usbclass_wrcomplete(FAR struct usbdev_ep_s *ep, struct usbdev_req_s *req)
{
FAR struct usbser_dev_s *priv;
FAR struct usbser_req_s *reqcontainer;
@@ -1334,7 +1335,7 @@ static int usbclass_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver
goto errout;
}
reqcontainer->req->private = reqcontainer;
- reqcontainer->req->callback = usbclass_epbulkoutcomplete;
+ reqcontainer->req->callback = usbclass_rdcomplete;
}
/* Pre-allocate write request containers and put in a free list */
@@ -1356,7 +1357,7 @@ static int usbclass_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver
goto errout;
}
reqcontainer->req->private = reqcontainer;
- reqcontainer->req->callback = usbclass_epbulkincomplete;
+ reqcontainer->req->callback = usbclass_wrcomplete;
flags = irqsave();
sq_addlast((sq_entry_t*)reqcontainer, &priv->reqlist);