mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 23:03:27 +08:00
Improve endpoint management
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3240 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
@@ -1405,7 +1405,7 @@
|
||||
* include/nuttx/spi.h -- the SPI_SETBITS macro was calling the setmode method.
|
||||
This is a very important bug-fix in some usages.
|
||||
|
||||
5.16 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
5.16 2011-01-10 Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
* include/nuttx/usb -- Created new directory. Moved all usb-related header
|
||||
files to this new directory. Created a skeleton for a new USB host header
|
||||
@@ -1418,3 +1418,4 @@
|
||||
* drivers/usbhost -- Add a USB host class driver for the (Bulk-Only) USB
|
||||
Mass Storage Class.
|
||||
|
||||
5.17 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
+13
-56
@@ -8,7 +8,7 @@
|
||||
<tr align="center" bgcolor="#e4e4e4">
|
||||
<td>
|
||||
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
|
||||
<p>Last Updated: January 9, 2011</p>
|
||||
<p>Last Updated: January 10, 2011</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -1969,50 +1969,18 @@ Other memory:
|
||||
</table>
|
||||
|
||||
<ul><pre>
|
||||
5.15 2010-12-12 Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
nuttx-5.16 2011-01-10 Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
* net/uip/uip_tcpaddsend.c and net/send.c -- Another place where the TCP sequence
|
||||
number problem "fixed" in 5.14 might occur.
|
||||
* net/send.c -- Check if the destination IP address is in the ARP table. If
|
||||
not, then don't consider the packet sent. It won't be, an ARP packet will go
|
||||
out instead. This improves behavior, for example, on the first GET request
|
||||
from a browser.
|
||||
* arch/arm/src/lpc17xx/lpc17_emacram.h and lpc17_allocateheap.c -- The Ethernet
|
||||
logic was using all of AHB SRAM Bank0 for Ethernet packet buffers (16Kb). An
|
||||
option was added to limit the amount of SRAM used for packet buffering and to
|
||||
re-use any extra Bank0 memory for heap. configs/olimex-lpc1766stk/nettest
|
||||
now uses only 8Kb at the beginning of Bank0; the 8Kb at the end of Bank0 is
|
||||
included in the heap
|
||||
* arch/arm/src/lpc17xx/lpc17_ssp.c -- Fix compilation errors when SSP1 is
|
||||
selected.
|
||||
* configs/olimex-lpc1766stk/nsh -- Enable network and SD/MMC card support in
|
||||
NSH. Networking and telnetd interface as well as SPI-based microSD are
|
||||
now functional.
|
||||
* examples/nsh/nsh_netinit.c -- Fix NSH bug. If CONFIG_NET is selected, but
|
||||
CONFIG_EXAMPLES_NSH_TELNETD is not selected, then the network is never
|
||||
initialized and bad things happen if you try to ping.
|
||||
* drivers/lcd -- Add header files for the Phillips PCF8833 LCD controller and
|
||||
for the Epson S1D15G10 LCD controller. A driver for the Nokia 6100 LCD is
|
||||
coming.
|
||||
* include/nuttx/spi.h and almost all other SPI files -- Added an optional
|
||||
cmddata() method to the SPI interface. Some devices require an additional
|
||||
out-of-band bit to specify if the next word sent to the device is a command
|
||||
or data. This is typical, for example, in "9-bit" displays where the 9th bit
|
||||
is the CMD/DATA bit. The cmddata method provides selection of command or data.
|
||||
* drivers/lcd/p14201.c -- Now uses the cmddata() method of the SPI interface.
|
||||
* arch/arm/src/lpc17xx/lpc17_usbdev.c -- LPC17xx USB driver now appears to
|
||||
to be fully functional. examples/usbstorage configuration verified (the
|
||||
examples/usbserial configuration is untested).
|
||||
* drivers/usbdev/usbserial.c and usbstorage.c -- All USB class drivers need
|
||||
to call DEV_CONNECT() when they are ready to be enumerated. That is,
|
||||
(1) initially when bound to the USB driver, and (2) after a USB reset.
|
||||
* drivers/lcd/nokia6100.c -- A driver for the Nokia 6100 LCD. This driver
|
||||
has not be verified as of the initial check-in.
|
||||
* configs/olimex-lpc1766stk/nx -- A NX graphics configuration for the Olimex
|
||||
LPC1766-STK board using the Nokia 6100 LCD driver. This configuration has
|
||||
not been verified as of the initial check-in.
|
||||
* include/nuttx/spi.h -- the SPI_SETBITS macro was calling the setmode method.
|
||||
This is a very important bug-fix in some usages.
|
||||
* include/nuttx/usb -- Created new directory. Moved all usb-related header
|
||||
files to this new directory. Created a skeleton for a new USB host header
|
||||
file
|
||||
* drivers/usbhost -- Add USB host "registry" where connect devices can be
|
||||
matched with the correct USB class driver.
|
||||
* arc/arc/src/lpc17xx/lpc17_usbhost.c -- Add a simple USB host driver for
|
||||
the NXP lpc17xx.
|
||||
* drivers/usbhost -- Add generic USB device enumeration logic.
|
||||
* drivers/usbhost -- Add a USB host class driver for the (Bulk-Only) USB
|
||||
Mass Storage Class.
|
||||
|
||||
pascal-2.0 2009-12-21 Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
@@ -2042,18 +2010,7 @@ buildroot-1.8 2009-12-21 <spudmonkey@racsa.co.cr>
|
||||
</table>
|
||||
|
||||
<ul><pre>
|
||||
nuttx-5.16 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
* include/nuttx/usb -- Created new directory. Moved all usb-related header
|
||||
files to this new directory. Created a skeleton for a new USB host header
|
||||
file
|
||||
* drivers/usbhost -- Add USB host "registry" where connect devices can be
|
||||
matched with the correct USB class driver.
|
||||
* arc/arc/src/lpc17xx/lpc17_usbhost.c -- Add a simple USB host driver for
|
||||
the NXP lpc17xx.
|
||||
* drivers/usbhost -- Add generic USB device enumeration logic.
|
||||
* drivers/usbhost -- Add a USB host class driver for the (Bulk-Only) USB
|
||||
Mass Storage Class.
|
||||
nuttx-5.17 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
pascal-2.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
|
||||
|
||||
@@ -214,10 +214,10 @@
|
||||
|
||||
/* Finally, use the remainder of the allocated OHCI for IO buffers */
|
||||
|
||||
#define LPC17_IOBUFFERS ((LPC17_OHCIRAM_END - LPC17_IOFREE_BASE) / CONFIG_USBHOST_IOBUFSIZE)
|
||||
|
||||
#if LPC17_IOBUFFERS < 1
|
||||
# warning "No IO buffers allocated"
|
||||
#if CONFIG_USBHOST_IOBUFSIZE > 0
|
||||
# define LPC17_IOBUFFERS ((LPC17_OHCIRAM_END - LPC17_IOFREE_BASE) / CONFIG_USBHOST_IOBUFSIZE)
|
||||
#else
|
||||
# define LPC17_IOBUFFERS 0
|
||||
#endif
|
||||
|
||||
/************************************************************************************
|
||||
|
||||
@@ -71,15 +71,13 @@
|
||||
* Definitions
|
||||
*******************************************************************************/
|
||||
|
||||
/* I think it is the case that all I/O buffers must lie in AHB SRAM because of
|
||||
* the OHCI DMA. But this definition has here so that I can experiment later
|
||||
* to see if this really required.
|
||||
/* All I/O buffers must lie in AHB SRAM because of the OHCI DMA. It might be
|
||||
* okay if no I/O buffers are used *IF* the application can guarantee that all
|
||||
* end-user I/O buffers reside in AHB SRAM.
|
||||
*/
|
||||
|
||||
#define CONFIG_UBHOST_AHBIOBUFFERS 1
|
||||
|
||||
#if defined(CONFIG_UBHOST_AHBIOBUFFERS) && LPC17_IOBUFFERS < 1
|
||||
# error "No IO buffers allocated"
|
||||
#if LPC17_IOBUFFERS < 1
|
||||
# warning "No IO buffers allocated"
|
||||
#endif
|
||||
|
||||
/* Frame Interval / Periodic Start */
|
||||
@@ -206,11 +204,9 @@ static void lpc17_putle16(uint8_t *dest, uint16_t val);
|
||||
|
||||
/* Descriptor helper functions *************************************************/
|
||||
|
||||
static struct ohci_ed_s *lpc17_edalloc(struct lpc17_usbhost_s *priv);
|
||||
static void lpc17_edfree(struct lpc17_usbhost_s *priv, struct ohci_ed_s *ed);
|
||||
static uint8_t *lpc17_tdalloc(struct lpc17_usbhost_s *priv);
|
||||
static void lpc17_tdfree(struct lpc17_usbhost_s *priv, uint8_t *buffer);
|
||||
#ifdef CONFIG_UBHOST_AHBIOBUFFERS
|
||||
#if LPC17_IOBUFFERS > 0
|
||||
static uint8_t *lpc17_ioalloc(struct lpc17_usbhost_s *priv);
|
||||
static void lpc17_iofree(struct lpc17_usbhost_s *priv, uint8_t *buffer);
|
||||
#endif
|
||||
@@ -230,6 +226,9 @@ static int lpc17_wait(FAR struct usbhost_driver_s *drvr, bool connected);
|
||||
static int lpc17_enumerate(FAR struct usbhost_driver_s *drvr);
|
||||
static int lpc17_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcaddr,
|
||||
uint16_t maxpacketsize);
|
||||
static int lpc17_epalloc(FAR struct usbhost_driver_s *drvr,
|
||||
const FAR struct usbhost_epdesc_s *epdesc, usbhost_ep_t *ep);
|
||||
static int lpc17_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
|
||||
static int lpc17_alloc(FAR struct usbhost_driver_s *drvr,
|
||||
FAR uint8_t **buffer, FAR size_t *maxlen);
|
||||
static int lpc17_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
|
||||
@@ -239,8 +238,7 @@ static int lpc17_ctrlin(FAR struct usbhost_driver_s *drvr,
|
||||
static int lpc17_ctrlout(FAR struct usbhost_driver_s *drvr,
|
||||
FAR const struct usb_ctrlreq_s *req,
|
||||
FAR const uint8_t *buffer);
|
||||
static int lpc17_transfer(FAR struct usbhost_driver_s *drvr,
|
||||
FAR struct usbhost_epdesc_s *ed,
|
||||
static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
|
||||
FAR uint8_t *buffer, size_t buflen);
|
||||
static void lpc17_disconnect(FAR struct usbhost_driver_s *drvr);
|
||||
|
||||
@@ -266,6 +264,8 @@ static struct lpc17_usbhost_s g_usbhost =
|
||||
.wait = lpc17_wait,
|
||||
.enumerate = lpc17_enumerate,
|
||||
.ep0configure = lpc17_ep0configure,
|
||||
.epalloc = lpc17_epalloc,
|
||||
.epfree = lpc17_epfree,
|
||||
.alloc = lpc17_alloc,
|
||||
.free = lpc17_free,
|
||||
.ctrlin = lpc17_ctrlin,
|
||||
@@ -280,7 +280,7 @@ static struct lpc17_usbhost_s g_usbhost =
|
||||
|
||||
static struct lpc17_edlist_s *g_edfree;
|
||||
static struct lpc17_buflist_s *g_tdfree;
|
||||
#ifdef CONFIG_UBHOST_AHBIOBUFFERS
|
||||
#if LPC17_IOBUFFERS > 0
|
||||
static struct lpc17_buflist_s *g_iofree;
|
||||
#endif
|
||||
|
||||
@@ -464,39 +464,6 @@ static void lpc17_putle16(uint8_t *dest, uint16_t val)
|
||||
dest[1] = val >> 8;
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
* Name: lpc17_edalloc
|
||||
*
|
||||
* Description:
|
||||
* Allocate an ED from the free list
|
||||
*
|
||||
*******************************************************************************/
|
||||
|
||||
static struct ohci_ed_s *lpc17_edalloc(struct lpc17_usbhost_s *priv)
|
||||
{
|
||||
struct ohci_ed_s *ret = (struct ohci_ed_s *)g_edfree;
|
||||
if (ret)
|
||||
{
|
||||
g_edfree = ((struct lpc17_edlist_s*)ret)->flink;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
* Name: lpc17_edfree
|
||||
*
|
||||
* Description:
|
||||
* Return an ED to the free list
|
||||
*
|
||||
*******************************************************************************/
|
||||
|
||||
static void lpc17_edfree(struct lpc17_usbhost_s *priv, struct ohci_ed_s *ed)
|
||||
{
|
||||
struct lpc17_edlist_s *edfree = (struct lpc17_edlist_s *)ed;
|
||||
edfree->flink = g_edfree;
|
||||
g_edfree = edfree;
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
* Name: lpc17_tdalloc
|
||||
*
|
||||
@@ -550,7 +517,7 @@ static void lpc17_tdfree(struct lpc17_usbhost_s *priv, uint8_t *buffer)
|
||||
*
|
||||
*******************************************************************************/
|
||||
|
||||
#ifdef CONFIG_UBHOST_AHBIOBUFFERS
|
||||
#if LPC17_IOBUFFERS > 0
|
||||
static uint8_t *lpc17_ioalloc(struct lpc17_usbhost_s *priv)
|
||||
{
|
||||
uint8_t *ret = (uint8_t *)g_iofree;
|
||||
@@ -570,7 +537,7 @@ static uint8_t *lpc17_ioalloc(struct lpc17_usbhost_s *priv)
|
||||
*
|
||||
*******************************************************************************/
|
||||
|
||||
#ifdef CONFIG_UBHOST_AHBIOBUFFERS
|
||||
#if LPC17_IOBUFFERS > 0
|
||||
static void lpc17_iofree(struct lpc17_usbhost_s *priv, uint8_t *buffer)
|
||||
{
|
||||
struct lpc17_buflist_s *iofree = (struct lpc17_buflist_s *)buffer;
|
||||
@@ -1067,6 +1034,104 @@ static int lpc17_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcadd
|
||||
return OK;
|
||||
}
|
||||
|
||||
/************************************************************************************
|
||||
* Name: lpc17_epalloc
|
||||
*
|
||||
* Description:
|
||||
* Allocate and configure one endpoint.
|
||||
*
|
||||
* Input Parameters:
|
||||
* drvr - The USB host driver instance obtained as a parameter from the call to
|
||||
* the class create() method.
|
||||
* epdesc - Describes the endpoint to be allocated.
|
||||
* ep - A memory location provided by the caller in which to receive the
|
||||
* allocated endpoint desciptor.
|
||||
*
|
||||
* Returned Values:
|
||||
* On success, zero (OK) is returned. On a failure, a negated errno value is
|
||||
* returned indicating the nature of the failure
|
||||
*
|
||||
* Assumptions:
|
||||
* This function will *not* be called from an interrupt handler.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
static int lpc17_epalloc(FAR struct usbhost_driver_s *drvr,
|
||||
const FAR struct usbhost_epdesc_s *epdesc, usbhost_ep_t *ep)
|
||||
{
|
||||
struct ohci_ed_s *ed;
|
||||
int ret = -ENOMEM;
|
||||
|
||||
DEBUGASSERT(epdesc && ep);
|
||||
|
||||
/* Take the next ED from the beginning of the free list */
|
||||
|
||||
ed = (struct ohci_ed_s *)g_edfree;
|
||||
if (ed)
|
||||
{
|
||||
/* Remove the ED from the freelist */
|
||||
|
||||
g_edfree = ((struct lpc17_edlist_s*)ed)->flink;
|
||||
|
||||
/* Configure the endpoint descriptor. */
|
||||
|
||||
lpc17_edinit(ed);
|
||||
ed->ctrl = (uint32_t)(epdesc->funcaddr) << ED_CONTROL_FA_SHIFT |
|
||||
(uint32_t)(epdesc->addr) << ED_CONTROL_EN_SHIFT |
|
||||
(uint32_t)(epdesc->mxpacketsize) << ED_CONTROL_MPS_SHIFT;
|
||||
|
||||
/* Get the direction of the endpoint */
|
||||
|
||||
if (epdesc->in != 0)
|
||||
{
|
||||
ed->ctrl |= ED_CONTROL_D_IN;
|
||||
}
|
||||
else
|
||||
{
|
||||
ed->ctrl |= ED_CONTROL_D_OUT;
|
||||
}
|
||||
|
||||
/* Return an opaque reference to the ED */
|
||||
|
||||
*ep = (usbhost_ep_t)ed;
|
||||
ret = OK;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/************************************************************************************
|
||||
* Name: lpc17_epfree
|
||||
*
|
||||
* Description:
|
||||
* Free and endpoint previously allocated by DRVR_EPALLOC.
|
||||
*
|
||||
* Input Parameters:
|
||||
* drvr - The USB host driver instance obtained as a parameter from the call to
|
||||
* the class create() method.
|
||||
* ep - The endpint to be freed.
|
||||
*
|
||||
* Returned Values:
|
||||
* On success, zero (OK) is returned. On a failure, a negated errno value is
|
||||
* returned indicating the nature of the failure
|
||||
*
|
||||
* Assumptions:
|
||||
* This function will *not* be called from an interrupt handler.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
static int lpc17_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
|
||||
{
|
||||
struct lpc17_edlist_s *ed = (struct lpc17_edlist_s *)ep;
|
||||
|
||||
DEBUGASSERT(ed);
|
||||
|
||||
/* Put the ED back into the free list */
|
||||
|
||||
ed->flink = g_edfree;
|
||||
g_edfree = ed;
|
||||
return OK;
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
* Name: lpc17_alloc
|
||||
*
|
||||
@@ -1251,7 +1316,7 @@ static int lpc17_ctrlout(FAR struct usbhost_driver_s *drvr,
|
||||
* Input Parameters:
|
||||
* drvr - The USB host driver instance obtained as a parameter from the call to
|
||||
* the class create() method.
|
||||
* ed - The IN or OUT endpoint descriptor for the device endpoint on which to
|
||||
* ep - The IN or OUT endpoint descriptor for the device endpoint on which to
|
||||
* perform the transfer.
|
||||
* buffer - A buffer containing the data to be sent (OUT endpoint) or received
|
||||
* (IN endpoint). buffer must have been allocated using DRVR_ALLOC
|
||||
@@ -1268,26 +1333,32 @@ static int lpc17_ctrlout(FAR struct usbhost_driver_s *drvr,
|
||||
*
|
||||
*******************************************************************************/
|
||||
|
||||
static int lpc17_transfer(FAR struct usbhost_driver_s *drvr,
|
||||
FAR struct usbhost_epdesc_s *ep,
|
||||
static int lpc17_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
|
||||
FAR uint8_t *buffer, size_t buflen)
|
||||
{
|
||||
struct lpc17_usbhost_s *priv = (struct lpc17_usbhost_s *)drvr;
|
||||
struct ohci_ed_s *ed = NULL;
|
||||
struct ohci_ed_s *ed = (struct ohci_ed_s *)ep;
|
||||
uint32_t dirpid;
|
||||
uint32_t regval;
|
||||
#ifdef CONFIG_UBHOST_AHBIOBUFFERS
|
||||
#if LPC17_IOBUFFERS > 0
|
||||
uint8_t *origbuf = NULL;
|
||||
#endif
|
||||
bool in;
|
||||
int ret;
|
||||
|
||||
DEBUGASSERT(drvr && ep && buffer && buflen > 0);
|
||||
DEBUGASSERT(priv && ed && buffer && buflen > 0);
|
||||
|
||||
in = (ed->ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN;
|
||||
uvdbg("EP%d %s toggle:%d maxpacket:%d buflen:%d\n",
|
||||
ep->addr, ep->in ? "IN" : "OUT", ep->toggle, ep->mxpacketsize, buflen);
|
||||
(ed->ctrl & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT,
|
||||
in ? "IN" : "OUT",
|
||||
(ed->headp & ED_HEADP_C) != 0 ? 1 : 0,
|
||||
(ed->ctrl & ED_CONTROL_MPS_MASK) >> ED_CONTROL_MPS_SHIFT,
|
||||
buflen);
|
||||
|
||||
/* Allocate an IO buffer if the user buffer does not lie in AHB SRAM */
|
||||
|
||||
#ifdef CONFIG_UBHOST_AHBIOBUFFERS
|
||||
#if LPC17_IOBUFFERS > 0
|
||||
if ((uintptr_t)buffer < LPC17_SRAM_BANK0 ||
|
||||
(uintptr_t)buffer >= (LPC17_SRAM_BANK0 + LPC17_BANK0_SIZE + LPC17_BANK1_SIZE))
|
||||
{
|
||||
@@ -1318,7 +1389,7 @@ static int lpc17_transfer(FAR struct usbhost_driver_s *drvr,
|
||||
* way around this copy.
|
||||
*/
|
||||
|
||||
if (ep->in == 0)
|
||||
if (!in)
|
||||
{
|
||||
memcpy(buffer, origbuf, buflen);
|
||||
}
|
||||
@@ -1336,45 +1407,17 @@ static int lpc17_transfer(FAR struct usbhost_driver_s *drvr,
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* Allocate an ED */
|
||||
|
||||
ed = lpc17_edalloc(priv);
|
||||
if (!ed)
|
||||
{
|
||||
udbg("ED allocation failed\n");
|
||||
ret = -ENOMEM;
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* Format the endpoint descriptor. This could be a lot simpler if
|
||||
* the OHCI ED structure were exposed outside of the driver.
|
||||
*/
|
||||
|
||||
lpc17_edinit(ed);
|
||||
ed->ctrl = (uint32_t)(ep->funcaddr) << ED_CONTROL_FA_SHIFT |
|
||||
(uint32_t)(ep->addr) << ED_CONTROL_EN_SHIFT |
|
||||
(uint32_t)(ep->mxpacketsize) << ED_CONTROL_MPS_SHIFT;
|
||||
|
||||
/* Get the direction of the endpoint */
|
||||
|
||||
if (ep->in != 0)
|
||||
if (in)
|
||||
{
|
||||
ed->ctrl |= ED_CONTROL_D_IN;
|
||||
dirpid = GTD_STATUS_DP_IN;
|
||||
}
|
||||
else
|
||||
{
|
||||
ed->ctrl |= ED_CONTROL_D_OUT;
|
||||
dirpid = GTD_STATUS_DP_OUT;
|
||||
}
|
||||
|
||||
/* Set/restore the toggle carry bit */
|
||||
|
||||
if (ep->toggle)
|
||||
{
|
||||
ed->headp = ED_HEADP_C;
|
||||
}
|
||||
|
||||
/* Then enqueue the transfer */
|
||||
|
||||
priv->tdstatus = TD_CC_NOERROR;
|
||||
@@ -1420,24 +1463,10 @@ static int lpc17_transfer(FAR struct usbhost_driver_s *drvr,
|
||||
ret = -EIO;
|
||||
}
|
||||
|
||||
/* Save the toggle carry bit. This bit is updated each time that an
|
||||
* ED is retired. This could be a lot simpler if the OHCI ED structure
|
||||
* were exposed outside of the driver.
|
||||
*/
|
||||
|
||||
if ((ed->headp & ED_HEADP_C) != 0)
|
||||
{
|
||||
ep->toggle = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
ep->toggle = 0;
|
||||
}
|
||||
|
||||
errout:
|
||||
/* Free any temporary IO buffers */
|
||||
|
||||
#ifdef CONFIG_UBHOST_AHBIOBUFFERS
|
||||
#if LPC17_IOBUFFERS > 0
|
||||
if (buffer && origbuf)
|
||||
{
|
||||
/* If this is an IN transaction, get the user data from the AHB
|
||||
@@ -1446,7 +1475,7 @@ errout:
|
||||
* way around this copy.
|
||||
*/
|
||||
|
||||
if (ep->in != 0 && ret == OK)
|
||||
if (in && ret == OK)
|
||||
{
|
||||
memcpy(origbuf, buffer, buflen);
|
||||
}
|
||||
@@ -1457,13 +1486,6 @@ errout:
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Free the endpoint descriptor */
|
||||
|
||||
if (ed)
|
||||
{
|
||||
lpc17_edfree(priv, ed);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -1644,7 +1666,7 @@ FAR struct usbhost_driver_s *usbhost_initialize(int controller)
|
||||
{
|
||||
/* Put the ED in a free list */
|
||||
|
||||
lpc17_edfree(priv, &EDFREE[i]);
|
||||
lpc17_epfree(&priv->drvr, (usbhost_ep_t)&EDFREE[i]);
|
||||
}
|
||||
|
||||
/* Initialize user-configurable TD buffers */
|
||||
@@ -1658,7 +1680,7 @@ FAR struct usbhost_driver_s *usbhost_initialize(int controller)
|
||||
buffer += CONFIG_USBHOST_TDBUFSIZE;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_UBHOST_AHBIOBUFFERS
|
||||
#if LPC17_IOBUFFERS > 0
|
||||
/* Initialize user-configurable IO buffers */
|
||||
|
||||
buffer = IOFREE;
|
||||
|
||||
@@ -443,7 +443,9 @@ Nucleus 2G Configuration Options
|
||||
CONFIG_USBHOST_TDBUFSIZE
|
||||
Size of one transfer descriptor buffer
|
||||
CONFIG_USBHOST_IOBUFSIZE
|
||||
Size of one end-user I/O buffer
|
||||
Size of one end-user I/O buffer. This can be zero if the
|
||||
application can guarantee that all end-user I/O buffers
|
||||
reside in AHB SRAM.
|
||||
|
||||
USB Host Configuration
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
@@ -689,7 +689,9 @@ Olimex LPC1766-STK Configuration Options
|
||||
CONFIG_USBHOST_TDBUFSIZE
|
||||
Size of one transfer descriptor buffer
|
||||
CONFIG_USBHOST_IOBUFSIZE
|
||||
Size of one end-user I/O buffer
|
||||
Size of one end-user I/O buffer. This can be zero if the
|
||||
application can guarantee that all end-user I/O buffers
|
||||
reside in AHB SRAM.
|
||||
|
||||
USB Host Configuration
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
+287
-224
File diff suppressed because it is too large
Load Diff
+74
-16
@@ -139,7 +139,7 @@
|
||||
* returned indicating the nature of the failure
|
||||
*
|
||||
* Assumptions:
|
||||
* This function may be called from an interrupt handler.
|
||||
* This function will *not* be called from an interrupt handler.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
@@ -225,6 +225,52 @@
|
||||
|
||||
#define DRVR_EP0CONFIGURE(drvr,funcaddr,mps) ((drvr)->ep0configure(drvr,funcaddr,mps))
|
||||
|
||||
/************************************************************************************
|
||||
* Name: DRVR_EPALLOC
|
||||
*
|
||||
* Description:
|
||||
* Allocate and configure one endpoint.
|
||||
*
|
||||
* Input Parameters:
|
||||
* drvr - The USB host driver instance obtained as a parameter from the call to
|
||||
* the class create() method.
|
||||
* epdesc - Describes the endpoint to be allocated.
|
||||
* ep - A memory location provided by the caller in which to receive the
|
||||
* allocated endpoint desciptor.
|
||||
*
|
||||
* Returned Values:
|
||||
* On success, zero (OK) is returned. On a failure, a negated errno value is
|
||||
* returned indicating the nature of the failure
|
||||
*
|
||||
* Assumptions:
|
||||
* This function will *not* be called from an interrupt handler.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
#define DRVR_EPALLOC(drvr,epdesc,ep) ((drvr)->epalloc(drvr,epdesc,ep))
|
||||
|
||||
/************************************************************************************
|
||||
* Name: DRVR_EPFREE
|
||||
*
|
||||
* Description:
|
||||
* Free and endpoint previously allocated by DRVR_EPALLOC.
|
||||
*
|
||||
* Input Parameters:
|
||||
* drvr - The USB host driver instance obtained as a parameter from the call to
|
||||
* the class create() method.
|
||||
* ep - The endpint to be freed.
|
||||
*
|
||||
* Returned Values:
|
||||
* On success, zero (OK) is returned. On a failure, a negated errno value is
|
||||
* returned indicating the nature of the failure
|
||||
*
|
||||
* Assumptions:
|
||||
* This function will *not* be called from an interrupt handler.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
#define DRVR_EPFREE(drvr,ep) ((drvr)->epfree(drvr,ep))
|
||||
|
||||
/************************************************************************************
|
||||
* Name: DRVR_ALLOC
|
||||
*
|
||||
@@ -441,11 +487,30 @@ struct usbhost_class_s
|
||||
int (*disconnected)(FAR struct usbhost_class_s *class);
|
||||
};
|
||||
|
||||
/* This structure describes one endpoint. It is used as an input to the
|
||||
* allocep() method.
|
||||
*/
|
||||
|
||||
struct usbhost_epdesc_s
|
||||
{
|
||||
uint8_t addr; /* Endpoint address */
|
||||
bool in; /* Direction: true->IN */
|
||||
uint8_t funcaddr; /* USB address of function containing endpoint */
|
||||
uint16_t mxpacketsize; /* Max packetsize */
|
||||
};
|
||||
|
||||
/* This type represents one endpoint configured by the allocep() method.
|
||||
* The actual form is know only internally to the USB host controller
|
||||
* (for example, for an OHCI driver, this would probably be a pointer
|
||||
* to an endpoint descriptor).
|
||||
*/
|
||||
|
||||
typedef FAR void *usbhost_ep_t;
|
||||
|
||||
/* struct usbhost_driver_s provides access to the USB host driver from the
|
||||
* USB host class implementation.
|
||||
*/
|
||||
|
||||
struct usbhost_epdesc_s;
|
||||
struct usbhost_driver_s
|
||||
{
|
||||
/* Wait for a device to connect or disconnect. */
|
||||
@@ -472,6 +537,12 @@ struct usbhost_driver_s
|
||||
int (*ep0configure)(FAR struct usbhost_driver_s *drvr, uint8_t funcaddr,
|
||||
uint16_t maxpacketsize);
|
||||
|
||||
/* Allocate and configure an endpoint. */
|
||||
|
||||
int (*epalloc)(FAR struct usbhost_driver_s *drvr,
|
||||
const FAR struct usbhost_epdesc_s *epdesc, usbhost_ep_t *ep);
|
||||
int (*epfree)(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
|
||||
|
||||
/* Some hardware supports special memory in which transfer descriptors can
|
||||
* be accessed more efficiently. The following methods provide a mechanism
|
||||
* to allocate and free the transfer descriptor memory. If the underlying
|
||||
@@ -508,8 +579,7 @@ struct usbhost_driver_s
|
||||
* transfer has completed.
|
||||
*/
|
||||
|
||||
int (*transfer)(FAR struct usbhost_driver_s *drvr,
|
||||
FAR struct usbhost_epdesc_s *ep,
|
||||
int (*transfer)(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
|
||||
FAR uint8_t *buffer, size_t buflen);
|
||||
|
||||
/* Called by the class when an error occurs and driver has been disconnected.
|
||||
@@ -521,18 +591,6 @@ struct usbhost_driver_s
|
||||
void (*disconnect)(FAR struct usbhost_driver_s *drvr);
|
||||
};
|
||||
|
||||
/* This structure describes one endpoint */
|
||||
|
||||
struct usbhost_epdesc_s
|
||||
{
|
||||
uint8_t addr : 4; /* Endpoint address */
|
||||
uint8_t pad : 3;
|
||||
uint8_t in : 1; /* Direction: 1->IN */
|
||||
uint8_t funcaddr : 7; /* USB address of function containing endpoint */
|
||||
uint8_t toggle : 1; /* Last toggle (modified by the driver) */
|
||||
uint16_t mxpacketsize; /* Max packetsize */
|
||||
};
|
||||
|
||||
/************************************************************************************
|
||||
* Public Data
|
||||
************************************************************************************/
|
||||
|
||||
Reference in New Issue
Block a user