summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-11-24 12:59:52 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-11-24 12:59:52 -0600
commit200f3703232cff30ef8d12392375acf862532e45 (patch)
tree0aaa73b36839504223906d1040ab2c2faab5e530
parentb6f5f4b545ef51b85524241e0f10adb5c21351a4 (diff)
downloadnuttx-200f3703232cff30ef8d12392375acf862532e45.tar.gz
nuttx-200f3703232cff30ef8d12392375acf862532e45.tar.bz2
nuttx-200f3703232cff30ef8d12392375acf862532e45.zip
Various issues/bugs detected by cppcheck
-rw-r--r--nuttx/arch/arm/src/c5471/c5471_ethernet.c1
-rw-r--r--nuttx/arch/arm/src/calypso/calypso_keypad.c2
-rw-r--r--nuttx/arch/arm/src/calypso/calypso_spi.c2
-rw-r--r--nuttx/arch/arm/src/calypso/calypso_timer.c2
-rw-r--r--nuttx/arch/arm/src/dm320/dm320_usbdev.c2
-rw-r--r--nuttx/arch/arm/src/efm32/efm32_dma.c9
6 files changed, 10 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c
index 40d802284..94a88a26e 100644
--- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c
+++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c
@@ -1600,6 +1600,7 @@ static int c5471_ifup(struct net_driver_s *dev)
/* Clear pending interrupts by reading the EIM status register */
clearbits = getreg32(EIM_STATUS);
+ UNUSED(clearbits);
/* Enable interrupts going from EIM Module to Interrupt Module. */
diff --git a/nuttx/arch/arm/src/calypso/calypso_keypad.c b/nuttx/arch/arm/src/calypso/calypso_keypad.c
index 141a20ab1..4ff6a5206 100644
--- a/nuttx/arch/arm/src/calypso/calypso_keypad.c
+++ b/nuttx/arch/arm/src/calypso/calypso_keypad.c
@@ -334,7 +334,7 @@ retry:
* posts keypad semaphore
****************************************************************************/
-inline int calypso_kbd_irq(int irq, uint32_t * regs)
+int calypso_kbd_irq(int irq, uint32_t * regs)
{
register uint16_t reg;
diff --git a/nuttx/arch/arm/src/calypso/calypso_spi.c b/nuttx/arch/arm/src/calypso/calypso_spi.c
index 881d66da2..a1e0a3f5a 100644
--- a/nuttx/arch/arm/src/calypso/calypso_spi.c
+++ b/nuttx/arch/arm/src/calypso/calypso_spi.c
@@ -99,7 +99,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
for (i = 0; i < nwords; i++)
{
- spi_xfer(0, priv->nbits, txbuffer+i, rxbuffer+i);
+ spi_xfer(0, priv->nbits, txbuffer + i, rxbuffer + i);
}
}
diff --git a/nuttx/arch/arm/src/calypso/calypso_timer.c b/nuttx/arch/arm/src/calypso/calypso_timer.c
index 7ce3f2efd..a4ddcfddc 100644
--- a/nuttx/arch/arm/src/calypso/calypso_timer.c
+++ b/nuttx/arch/arm/src/calypso/calypso_timer.c
@@ -71,7 +71,7 @@ void hwtimer_enable(int num, int on)
uint8_t ctl;
if (num < 1 || num > 2) {
- printf("Unknown timer %u\n", num);
+ printf("Unknown timer %d\n", num);
return;
}
diff --git a/nuttx/arch/arm/src/dm320/dm320_usbdev.c b/nuttx/arch/arm/src/dm320/dm320_usbdev.c
index 0749a1392..68ca40957 100644
--- a/nuttx/arch/arm/src/dm320/dm320_usbdev.c
+++ b/nuttx/arch/arm/src/dm320/dm320_usbdev.c
@@ -1881,6 +1881,7 @@ static int dm320_epconfigure(FAR struct usbdev_ep_s *ep,
/* Retain what we need from the descriptor */
usbtrace(TRACE_EPCONFIGURE, privep->epphy);
+ UNUSED(privep);
DEBUGASSERT(desc->addr == ep->eplog);
return OK;
}
@@ -2227,6 +2228,7 @@ static void dm320_freeep(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep)
{
FAR struct dm320_ep_s *privep = (FAR struct dm320_ep_s *)ep;
usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy);
+ UNUSED(privep);
/* Nothing needs to be done */
}
diff --git a/nuttx/arch/arm/src/efm32/efm32_dma.c b/nuttx/arch/arm/src/efm32/efm32_dma.c
index 1c3f50bf2..f27929c0e 100644
--- a/nuttx/arch/arm/src/efm32/efm32_dma.c
+++ b/nuttx/arch/arm/src/efm32/efm32_dma.c
@@ -689,7 +689,7 @@ void efm32_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
flags = irqsave();
regval = getreg32(EFM32_DMA_IEN);
regval |= bit;
- putreg32(bit, EFM32_DMA_IEN);
+ putreg32(regval, EFM32_DMA_IEN);
/* Enable the channel */
@@ -729,7 +729,7 @@ void efm32_dmastop(DMA_HANDLE handle)
regval = getreg32(EFM32_DMA_IEN);
regval |= bit;
- putreg32(bit, EFM32_DMA_IEN);
+ putreg32(regval, EFM32_DMA_IEN);
irqrestore(flags);
}
@@ -747,7 +747,7 @@ void efm32_dmastop(DMA_HANDLE handle)
#ifdef CONFIG_DEBUG_DMA
void efm32_dmasample(DMA_HANDLE handle, struct efm32_dmaregs_s *regs)
{
- struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle;
+ struct dma_channel_s *dmach = (struct dma_channel_s *)handle;
uintptr_t regaddr;
irqstate_t flags;
@@ -801,8 +801,7 @@ void efm32_dmasample(DMA_HANDLE handle, struct efm32_dmaregs_s *regs)
void efm32_dmadump(DMA_HANDLE handle, const struct efm32_dmaregs_s *regs,
const char *msg)
{
- struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
- struct sam_xdmac_s *xdmac = sam_controller(xdmach);
+ struct dma_channel_s *dmach = (struct dma_channel_s *)handle;
dmadbg("%s\n", msg);
dmadbg(" DMA Registers:\n");