Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-27 18:58:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

More bugs/warnings found by cppcheck

Browse Source
This commit is contained in:
Gregory Nutt
2014-11-24 13:24:51 -06:00
parent 8becf3c18c
commit 697b0f8f19
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/lpc17xx/lpc17_usbdev.c
+1 -1
View File
@@ -1713,7 +1713,7 @@ static inline void lpc17_ep0setup(struct lpc17_usbdev_s *priv)
(privep = lpc17_epfindbyaddr(priv, index)) != NULL) (privep = lpc17_epfindbyaddr(priv, index)) != NULL)
{ {
privep->halted = 0; privep->halted = 0;
ret = lpc17_epstall(&privep->ep, true); (void)lpc17_epstall(&privep->ep, true);
lpc17_epwrite(LPC17_EP0_IN, NULL, 0); lpc17_epwrite(LPC17_EP0_IN, NULL, 0);
priv->ep0state = LPC17_EP0STATUSIN; priv->ep0state = LPC17_EP0STATUSIN;
} }
arch/arm/src/lpc17xx/lpc17_usbhost.c
+1 -1
View File
@@ -1089,7 +1089,7 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv,
/* Save the new minimum interval */ /* Save the new minimum interval */
if ((ed->hw.ctrl && ED_CONTROL_D_MASK) == ED_CONTROL_D_IN) if ((ed->hw.ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN)
{ {
priv->ininterval = interval; priv->ininterval = interval;
} }
arch/arm/src/lpc214x/lpc214x_usbdev.c
+2 -1
View File
@@ -1670,7 +1670,7 @@ static inline void lpc214x_ep0setup(struct lpc214x_usbdev_s *priv)
(privep = lpc214x_epfindbyaddr(priv, index)) != NULL) (privep = lpc214x_epfindbyaddr(priv, index)) != NULL)
{ {
privep->halted = 0; privep->halted = 0;
ret = lpc214x_epstall(&privep->ep, true); (void)lpc214x_epstall(&privep->ep, true);
lpc214x_epwrite(LPC214X_EP0_IN, NULL, 0); lpc214x_epwrite(LPC214X_EP0_IN, NULL, 0);
priv->ep0state = LPC214X_EP0STATUSIN; priv->ep0state = LPC214X_EP0STATUSIN;
} }
@@ -2067,6 +2067,7 @@ static int lpc214x_usbinterrupt(int irq, FAR void *context)
errcode = (uint8_t)lpc214x_usbcmd(CMD_USB_DEV_READERRORSTATUS, 0) & 0x0f; errcode = (uint8_t)lpc214x_usbcmd(CMD_USB_DEV_READERRORSTATUS, 0) & 0x0f;
usbtrace(TRACE_INTDECODE(LPC214X_TRACEINTID_EPRINT), (uint16_t)errcode); usbtrace(TRACE_INTDECODE(LPC214X_TRACEINTID_EPRINT), (uint16_t)errcode);
UNUSED(errcode);
} }
#endif #endif
arch/arm/src/lpc2378/lpc23xx_spi.c
+18 -8
View File
@@ -247,14 +247,18 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
{ {
#ifndef CONFIG_SPI_OWNBUS
FAR struct lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev; FAR struct lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev;
#endif
uint32_t divisor; uint32_t divisor;
uint32_t actual; uint32_t actual;
/* Check if the requested frequence is the same as the frequency selection */ DEBUGASSERT(frequency <= SPI_CLOCK / 2);
DEBUGASSERT(priv && frequency <= SPI_CLOCK / 2);
#ifndef CONFIG_SPI_OWNBUS #ifndef CONFIG_SPI_OWNBUS
/* Check if the requested frequency is the same as the frequency selection */
DEBUGASSERT(priv);
if (priv->frequency == frequency) if (priv->frequency == frequency)
{ {
/* We are already at this frequency. Return the actual. */ /* We are already at this frequency. Return the actual. */
@@ -316,12 +320,15 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
{ {
#ifndef CONFIG_SPI_OWNBUS
FAR struct lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev; FAR struct lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev;
#endif
uint32_t regval; uint32_t regval;
#ifndef CONFIG_SPI_OWNBUS
/* Has the mode changed? */ /* Has the mode changed? */
#ifndef CONFIG_SPI_OWNBUS DEBUGASSERT(priv);
if (mode != priv->mode) if (mode != priv->mode)
{ {
#endif #endif
@@ -379,24 +386,27 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
{ {
#ifndef CONFIG_SPI_OWNBUS
FAR struct lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev; FAR struct lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev;
#endif
uint32_t regval; uint32_t regval;
/* Has the number of bits changed? */ DEBUGASSERT(nbits > 7 && nbits < 17);
DEBUGASSERT(priv && nbits > 7 && nbits < 17);
#ifndef CONFIG_SPI_OWNBUS #ifndef CONFIG_SPI_OWNBUS
/* Has the number of bits changed? */
DEBUGASSERT(priv);
if (nbits != priv->nbits) if (nbits != priv->nbits)
{ {
#endif #endif
/* Yes... Set CR appropriately */ /* Yes... Set CR appropriately */
regval = getreg32(SPI_CR); regval = getreg32(SPI_CR);
regval &= ~SPI_CR_BITS_MASK; regval &= ~SPI_CR_BITS_MASK;
regval |= (nbits << SPI_CR_BITS_SHIFT) & SPI_CR_BITS_MASK; regval |= (nbits << SPI_CR_BITS_SHIFT) & SPI_CR_BITS_MASK;
regval |= SPI_CR_BITENABLE; regval |= SPI_CR_BITENABLE;
regval = getreg32(SPI_CR); putreg32(regval, SPI_CR);
/* Save the selection so the subsequence re-configurations will be faster */ /* Save the selection so the subsequence re-configurations will be faster */