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

Cosmetic changes to comments and README

Browse Source
This commit is contained in:
Gregory Nutt 2014-04-07 15:28:04 -06:00
parent 43abe85674
commit 2a1212bf48
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/tiva/tiva_dumpgpio.c
View File

@ -204,6 +204,7 @@ static inline uint8_t tiva_gpioport(int port)
int tiva_dumpgpio(uint32_t pinset, const char *msg)
{
#ifdef CONFIG_DEBUG
irqstate_t flags;
unsigned int port = (pinset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
uintptr_t base;
@ -242,6 +243,9 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg)
getreg32(base + TIVA_GPIO_PUR_OFFSET), getreg32(base + TIVA_GPIO_PDR_OFFSET),
getreg32(base + TIVA_GPIO_SLR_OFFSET));
}
irqrestore(flags);
#endif /* CONFIG_DEBUG */
return OK;
}

7
arch/arm/src/tiva/tiva_ssi.c
View File

@ -834,6 +834,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer,
ssi_getreg(priv, TIVA_SSI_SR_OFFSET));
ntxd = ssi_performtx(priv);
UNUSED(ntxd);
/* For the case where nwords < Tx FIFO size, ssi_performrx will
* configure interrupts correctly for the final phase of the
@ -873,6 +874,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer,
/* Handle outgoing Tx FIFO transfers */
ntxd = ssi_performtx(priv);
UNUSED(ntxd);
/* Handle incoming Rx FIFO transfers */
@ -886,6 +888,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer,
}
while (priv->nrxwords < priv->nwords);
#endif
return OK;
}
@ -996,6 +999,7 @@ static int ssi_interrupt(int irq, void *context)
ssidbg("Transfer complete\n");
ssi_semgive(&priv->xfrsem);
}
return OK;
}
#endif
@ -1043,6 +1047,7 @@ static int ssi_lock(FAR struct spi_dev_s *dev, bool lock)
{
(void)sem_post(&priv->exclsem);
}
return OK;
}
#endif
@ -1160,8 +1165,10 @@ static uint32_t ssi_setfrequencyinternal(struct tiva_ssidev_s *priv,
priv->frequency = frequency;
priv->actual = actual;
}
return priv->actual;
#else
return actual;
#endif
}