sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct an error recently introduced in the STM32 and EFM32 USB host controller drivers.

Browse Source 
The test for data partially transferred is incorrectec: chan->xfrd != xfrlen
Should be chan->xfrd > 0

From Ronly XLN.
This commit is contained in:
Gregory Nutt 2015-05-11 09:04:25 -06:00
parent 89c0e3faa0
commit 33f5015f21
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/src/efm32/efm32_usbhost.c
View File

@ -1955,14 +1955,14 @@ static ssize_t efm32_in_transfer(FAR struct efm32_usbhost_s *priv, int chidx,
/* Check for a special case: If (1) the transfer was NAKed and (2) /* Check for a special case: If (1) the transfer was NAKed and (2)
* no Tx FIFO empty or Rx FIFO not-empty event occurred, then we * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we
* should be able to just flush the Rx and Tx FIFOs and try again. * should be able to just flush the Rx and Tx FIFOs and try again.
* We can detect this latter case becasue the then the transfer * We can detect this latter case because the then the transfer
* buffer pointer and buffer size will be unaltered. * buffer pointer and buffer size will be unaltered.
*/ */
elapsed = clock_systimer() - start; elapsed = clock_systimer() - start;
if (ret != -EAGAIN || /* Not a NAK condition OR */ if (ret != -EAGAIN || /* Not a NAK condition OR */
elapsed >= EFM32_DATANAK_DELAY || /* Timeout has elapsed OR */ elapsed >= EFM32_DATANAK_DELAY || /* Timeout has elapsed OR */
chan->xfrd > 0) /* Data has been partially transferred */ chan->xfrd > 0) /* Data has been partially transferred */
{ {
/* Break out and return the error */ /* Break out and return the error */
@ -2221,14 +2221,14 @@ static ssize_t efm32_out_transfer(FAR struct efm32_usbhost_s *priv, int chidx,
/* Check for a special case: If (1) the transfer was NAKed and (2) /* Check for a special case: If (1) the transfer was NAKed and (2)
* no Tx FIFO empty or Rx FIFO not-empty event occurred, then we * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we
* should be able to just flush the Rx and Tx FIFOs and try again. * should be able to just flush the Rx and Tx FIFOs and try again.
* We can detect this latter case becasue the then the transfer * We can detect this latter case because the then the transfer
* buffer pointer and buffer size will be unaltered. * buffer pointer and buffer size will be unaltered.
*/ */
elapsed = clock_systimer() - start; elapsed = clock_systimer() - start;
if (ret != -EAGAIN || /* Not a NAK condition OR */ if (ret != -EAGAIN || /* Not a NAK condition OR */
elapsed >= EFM32_DATANAK_DELAY || /* Timeout has elapsed OR */ elapsed >= EFM32_DATANAK_DELAY || /* Timeout has elapsed OR */
chan->xfrd != xfrlen) /* Data has been partially transferred */ chan->xfrd > 0) /* Data has been partially transferred */
{ {
/* Break out and return the error */ /* Break out and return the error */

16
arch/arm/src/stm32/stm32_otgfshost.c
View File

@ -1877,14 +1877,14 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
/* Check for a special case: If (1) the transfer was NAKed and (2) /* Check for a special case: If (1) the transfer was NAKed and (2)
* no Tx FIFO empty or Rx FIFO not-empty event occurred, then we * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we
* should be able to just flush the Rx and Tx FIFOs and try again. * should be able to just flush the Rx and Tx FIFOs and try again.
* We can detect this latter case becasue the then the transfer * We can detect this latter case because the then the transfer
* buffer pointer and buffer size will be unaltered. * buffer pointer and buffer size will be unaltered.
*/ */
elapsed = clock_systimer() - start; elapsed = clock_systimer() - start;
if (ret != -EAGAIN || /* Not a NAK condition OR */ if (ret != -EAGAIN || /* Not a NAK condition OR */
elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */ elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */
chan->xfrd > 0) /* Data has been partially transferred */ chan->xfrd > 0) /* Data has been partially transferred */
{ {
/* Break out and return the error */ /* Break out and return the error */
@ -2143,14 +2143,14 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
/* Check for a special case: If (1) the transfer was NAKed and (2) /* Check for a special case: If (1) the transfer was NAKed and (2)
* no Tx FIFO empty or Rx FIFO not-empty event occurred, then we * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we
* should be able to just flush the Rx and Tx FIFOs and try again. * should be able to just flush the Rx and Tx FIFOs and try again.
* We can detect this latter case becasue the then the transfer * We can detect this latter case because the then the transfer
* buffer pointer and buffer size will be unaltered. * buffer pointer and buffer size will be unaltered.
*/ */
elapsed = clock_systimer() - start; elapsed = clock_systimer() - start;
if (ret != -EAGAIN || /* Not a NAK condition OR */ if (ret != -EAGAIN || /* Not a NAK condition OR */
elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */ elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */
chan->xfrd != xfrlen) /* Data has been partially transferred */ chan->xfrd > 0) /* Data has been partially transferred */
{ {
/* Break out and return the error */ /* Break out and return the error */

16
arch/arm/src/stm32/stm32_otghshost.c
View File

@ -1877,14 +1877,14 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
/* Check for a special case: If (1) the transfer was NAKed and (2) /* Check for a special case: If (1) the transfer was NAKed and (2)
* no Tx FIFO empty or Rx FIFO not-empty event occurred, then we * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we
* should be able to just flush the Rx and Tx FIFOs and try again. * should be able to just flush the Rx and Tx FIFOs and try again.
* We can detect this latter case becasue the then the transfer * We can detect this latter case because the then the transfer
* buffer pointer and buffer size will be unaltered. * buffer pointer and buffer size will be unaltered.
*/ */
elapsed = clock_systimer() - start; elapsed = clock_systimer() - start;
if (ret != -EAGAIN || /* Not a NAK condition OR */ if (ret != -EAGAIN || /* Not a NAK condition OR */
elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */ elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */
chan->xfrd > 0) /* Data has been partially transferred */ chan->xfrd > 0) /* Data has been partially transferred */
{ {
/* Break out and return the error */ /* Break out and return the error */
@ -2143,14 +2143,14 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
/* Check for a special case: If (1) the transfer was NAKed and (2) /* Check for a special case: If (1) the transfer was NAKed and (2)
* no Tx FIFO empty or Rx FIFO not-empty event occurred, then we * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we
* should be able to just flush the Rx and Tx FIFOs and try again. * should be able to just flush the Rx and Tx FIFOs and try again.
* We can detect this latter case becasue the then the transfer * We can detect this latter case because the then the transfer
* buffer pointer and buffer size will be unaltered. * buffer pointer and buffer size will be unaltered.
*/ */
elapsed = clock_systimer() - start; elapsed = clock_systimer() - start;
if (ret != -EAGAIN || /* Not a NAK condition OR */ if (ret != -EAGAIN || /* Not a NAK condition OR */
elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */ elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */
chan->xfrd != xfrlen) /* Data has been partially transferred */ chan->xfrd > 0) /* Data has been partially transferred */
{ {
/* Break out and return the error */ /* Break out and return the error */