diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-08-25 14:45:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-08-25 14:45:08 -0600 |
| commit | 4cdc5d964f5a4966f1733af19d32643ef8b7306b (patch) | |
| tree | b1ba48c2c1a8c8daa463f48f88d5f14c2345a650 | |
| parent | 1bc3365333b0243840cb87a9f8a267d77efdc651 (diff) | |
| download | nuttx-4cdc5d964f5a4966f1733af19d32643ef8b7306b.tar.gz nuttx-4cdc5d964f5a4966f1733af19d32643ef8b7306b.tar.bz2 nuttx-4cdc5d964f5a4966f1733af19d32643ef8b7306b.zip | |
SAMA5 EHCI: Data toggle and status phase fixes
| -rwxr-xr-x | nuttx/arch/arm/src/sama5/sam_ehci.c | 5 | ||||
| -rw-r--r-- | nuttx/configs/olimex-stm32-p107/src/p107-internal.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/sama5/sam_ehci.c b/nuttx/arch/arm/src/sama5/sam_ehci.c index d5de475fa..02f99fee2 100755 --- a/nuttx/arch/arm/src/sama5/sam_ehci.c +++ b/nuttx/arch/arm/src/sama5/sam_ehci.c @@ -1749,8 +1749,7 @@ static struct sam_qtd_s *sam_qtd_statusphase(uint32_t tokenbits) */ regval = tokenbits | QTD_TOKEN_ACTIVE | QTD_TOKEN_IOC | - ((uint32_t)3 << QTD_TOKEN_CERR_SHIFT) | - ((uint32_t)USB_SIZEOF_CTRLREQ << QTD_TOKEN_NBYTES_SHIFT); + ((uint32_t)3 << QTD_TOKEN_CERR_SHIFT); qtd->hw.token = sam_swap32(regval); return qtd; @@ -1877,7 +1876,7 @@ static ssize_t sam_async_transfer(struct sam_rhport_s *rhport, /* Get the new forward link pointer and data toggle */ flink = &qtd->hw.nqp; - toggle = QTD_TOKEN_TOGGLE; + toggle = 0; } /* A buffer may or may be supplied with an EP0 SETUP transfer. A buffer will diff --git a/nuttx/configs/olimex-stm32-p107/src/p107-internal.h b/nuttx/configs/olimex-stm32-p107/src/p107-internal.h index f699e70d3..8603baca2 100644 --- a/nuttx/configs/olimex-stm32-p107/src/p107-internal.h +++ b/nuttx/configs/olimex-stm32-p107/src/p107-internal.h @@ -47,7 +47,7 @@ * Definitions ******************************************************************************/ -/* ENCX24J600 +/* Olimex MOD-ENC624J600 Module * * --- ------ -------------- --------------------------------------------------- * PIN NAME SIGNAL NOTES |