From 56078692ce87c87cf4878d3015039478a53895cc Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 12 Jun 2009 00:29:07 +0000 Subject: Same as last check-in, just implemented more sanely git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1880 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c | 4 ++-- nuttx/drivers/usbdev/usbdev_scsi.c | 10 +++++----- nuttx/drivers/usbdev/usbdev_storage.c | 4 ++-- nuttx/include/nuttx/usbdev.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c index a7d1f4266..f4bd1bd13 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c @@ -1078,7 +1078,7 @@ static int lpc214x_wrrequest(struct lpc214x_ep_s *privep) /* Send the largest number of bytes that we can in this packet */ - buf = (ubyte*)privreq->req.buf + privreq->req.xfrd; + buf = privreq->req.buf + privreq->req.xfrd; lpc214x_epwrite(privep->epphy, buf, nbytes); /* Update for the next time through the loop */ @@ -1139,7 +1139,7 @@ static int lpc214x_rdrequest(struct lpc214x_ep_s *privep) /* Receive the next packet */ - buf = (ubyte*)privreq->req.buf + privreq->req.xfrd; + buf = privreq->req.buf + privreq->req.xfrd; nbytesread = lpc214x_epread(privep->epphy, buf, privep->ep.maxpacket); if (nbytesread < 0) { diff --git a/nuttx/drivers/usbdev/usbdev_scsi.c b/nuttx/drivers/usbdev/usbdev_scsi.c index 89fe7c11e..088dc3ec2 100644 --- a/nuttx/drivers/usbdev/usbdev_scsi.c +++ b/nuttx/drivers/usbdev/usbdev_scsi.c @@ -1665,12 +1665,12 @@ static int usbstrg_cmdparsestate(FAR struct usbstrg_dev_s *priv) return -ENOMEM; } DEBUGASSERT(privreq->req && privreq->req->buf); - buf = (ubyte*)privreq->req->buf; + buf = privreq->req->buf; /* Assume that no errors will be encountered */ - priv->phaseerror = 0; - priv->shortpacket = 0; + priv->phaseerror = 0; + priv->shortpacket = 0; /* No data is buffered */ @@ -2018,7 +2018,7 @@ static int usbstrg_cmdreadstate(FAR struct usbstrg_dev_s *priv) */ src = &priv->iobuffer[lun->sectorsize - priv->nsectbytes]; - dest = (ubyte*)&req->buf[priv->nreqbytes]; + dest = &req->buf[priv->nreqbytes]; nbytes = min(CONFIG_USBSTRG_BULKINREQLEN - priv->nreqbytes, priv->nsectbytes); @@ -2150,7 +2150,7 @@ static int usbstrg_cmdwritestate(FAR struct usbstrg_dev_s *priv) { /* Copy the data received in the read request into the sector I/O buffer */ - src = (ubyte*)&req->buf[xfrd - priv->nreqbytes]; + src = &req->buf[xfrd - priv->nreqbytes]; dest = &priv->iobuffer[priv->nsectbytes]; nbytes = min(lun->sectorsize - priv->nsectbytes, priv->nreqbytes); diff --git a/nuttx/drivers/usbdev/usbdev_storage.c b/nuttx/drivers/usbdev/usbdev_storage.c index 7dcd911af..99651c15b 100644 --- a/nuttx/drivers/usbdev/usbdev_storage.c +++ b/nuttx/drivers/usbdev/usbdev_storage.c @@ -800,9 +800,9 @@ static int usbstrg_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *c case USB_DESC_TYPE_CONFIG: { #ifdef CONFIG_USBDEV_DUALSPEED - ret = usbstrg_mkcfgdesc((ubyte*)ctrlreq->buf, dev->speed, len); + ret = usbstrg_mkcfgdesc(ctrlreq->buf, dev->speed, len); #else - ret = usbstrg_mkcfgdesc((ubyte*)ctrlreq->buf); + ret = usbstrg_mkcfgdesc(ctrlreq->buf); #endif } break; diff --git a/nuttx/include/nuttx/usbdev.h b/nuttx/include/nuttx/usbdev.h index 3066baa5c..57a9f36fe 100644 --- a/nuttx/include/nuttx/usbdev.h +++ b/nuttx/include/nuttx/usbdev.h @@ -190,7 +190,7 @@ struct usbdev_ep_s; struct usbdev_req_s { - char *buf; /* Call: Buffer used for data; Return: Unchanged */ + ubyte *buf; /* Call: Buffer used for data; Return: Unchanged */ ubyte flags; /* See USBDEV_REQFLAGS_* definitions */ uint16 len; /* Call: Total length of data in buf; Return: Unchanged */ uint16 xfrd; /* Call: zero; Return: Bytes transferred so far */ -- cgit v1.2.3