diff options
Diffstat (limited to 'nuttx/arch/arm/src')
-rw-r--r-- | nuttx/arch/arm/src/imx/imx_spi.c | 9 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_pindma.c | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_pinirq.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kl/kl_gpio.h | 7 |
4 files changed, 22 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/imx/imx_spi.c b/nuttx/arch/arm/src/imx/imx_spi.c index 5ee601263..4d846af3c 100644 --- a/nuttx/arch/arm/src/imx/imx_spi.c +++ b/nuttx/arch/arm/src/imx/imx_spi.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/imx/imx_spi.c * - * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -728,9 +728,12 @@ 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) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; - uint32_t actual = priv->actual; + uint32_t actual; - if (priv && frequency != priv->frequency) + DEBUGASSERT(priv); + actual = priv->actual; + + if (frequency != priv->frequency) { uint32_t freqbits; uint32_t regval; diff --git a/nuttx/arch/arm/src/kinetis/kinetis_pindma.c b/nuttx/arch/arm/src/kinetis/kinetis_pindma.c index 91132a6a7..40acdc036 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_pindma.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_pindma.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/kinetis/kinetis_pindma.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 201, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -84,6 +84,10 @@ void kinetis_pindmaenable(uint32_t pinset) DEBUGASSERT(port < KINETIS_NPORTS); if (port < KINETIS_NPORTS) { + /* Get the base address of PORT block for this port */ + + base = KINETIS_PORT_BASE(port); + /* Modify the IRQC field of the port PCR register in order to enable DMA. */ regval = getreg32(base + KINETIS_PORT_PCR_OFFSET(pin)); @@ -134,6 +138,10 @@ void kinetis_pindmadisable(uint32_t pinset) DEBUGASSERT(port < KINETIS_NPORTS); if (port < KINETIS_NPORTS) { + /* Get the base address of PORT block for this port */ + + base = KINETIS_PORT_BASE(port); + /* Clear the IRQC field of the port PCR register in order to disable DMA. */ regval = getreg32(base + KINETIS_PORT_PCR_OFFSET(pin)); diff --git a/nuttx/arch/arm/src/kinetis/kinetis_pinirq.c b/nuttx/arch/arm/src/kinetis/kinetis_pinirq.c index 537e7be9f..6535ac3a2 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_pinirq.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_pinirq.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/kinetis/kinetis_pinirq.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/arch/arm/src/kl/kl_gpio.h b/nuttx/arch/arm/src/kl/kl_gpio.h index 647fbe45d..e1db46d9a 100644 --- a/nuttx/arch/arm/src/kl/kl_gpio.h +++ b/nuttx/arch/arm/src/kl/kl_gpio.h @@ -313,7 +313,8 @@ typedef uint32_t gpio_cfgset_t; #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -353,5 +354,9 @@ void kl_gpiowrite(uint32_t pinset, bool value); bool kl_gpioread(uint32_t pinset); +#undef EXTERN +#if defined(__cplusplus) +} +#endif #endif /* __ASSEMBLY__ */ #endif /* __ARCH_ARM_SRC_KL_KINETIS_GPIO_H */ |