diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-05-15 11:41:58 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-05-15 11:41:58 -0600 |
| commit | fa2541d0007cccfd0f083ab7d3e29658938a37a4 (patch) | |
| tree | 76d1cfd7fc9ed98d6b6c546a18dbe8984c6a0aba /nuttx | |
| parent | b6e67e6ce20022b688c80f503b59ff61175b90ad (diff) | |
| download | nuttx-fa2541d0007cccfd0f083ab7d3e29658938a37a4.tar.gz nuttx-fa2541d0007cccfd0f083ab7d3e29658938a37a4.tar.bz2 nuttx-fa2541d0007cccfd0f083ab7d3e29658938a37a4.zip | |
SAM4E GPIO: Fix some compile errors when CONFIG_DEBUG_GPIO is enabled
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_gpio.c | 10 | ||||
| -rw-r--r-- | nuttx/configs/sam4e-ek/README.txt | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 80d1c1b17..fc8659cf6 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -7338,3 +7338,6 @@ * arch/arm/src/stm32/stm32_i2c_alt.c: Add an alternative I2C implementation for the STM32 F03 that works around errata in that part. From Patrizio Simona (2014-5-14). + * arch/arm/src/sam34/sam_gpio.c: Fix some SAM4E compiler errors when + CONFIG_DEBUG_GPIO is enabled (2014-5-15). + diff --git a/nuttx/arch/arm/src/sam34/sam_gpio.c b/nuttx/arch/arm/src/sam34/sam_gpio.c index da581eed1..917567807 100644 --- a/nuttx/arch/arm/src/sam34/sam_gpio.c +++ b/nuttx/arch/arm/src/sam34/sam_gpio.c @@ -376,9 +376,9 @@ static inline int sam_configperiph(uintptr_t base, uint32_t pin, int sam_configgpio(gpio_pinset_t cfgset) { uintptr_t base = sam_gpiobase(cfgset); - uint32_t pin = sam_gpiopin(cfgset); + uint32_t pin = sam_gpiopin(cfgset); irqstate_t flags; - int ret; + int ret; /* Disable interrupts to prohibit re-entrance. */ @@ -484,12 +484,10 @@ int sam_dumpgpio(uint32_t pinset, const char *msg) { irqstate_t flags; uintptr_t base; - unsigned int pin; unsigned int port; /* Get the base address associated with the PIO port */ - pin = sam_gpiopin(pinset); port = (pinset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT; base = SAM_PION_BASE(port); @@ -511,7 +509,7 @@ int sam_dumpgpio(uint32_t pinset, const char *msg) #elif defined(CONFIG_ARCH_CHIP_SAM4S) || defined(CONFIG_ARCH_CHIP_SAM4E) lldbg(" ABCDSR: %08x %08x IFSCSR: %08x PPDSR: %08x\n", getreg32(base + SAM_PIO_ABCDSR1_OFFSET), getreg32(base + SAM_PIO_ABCDSR2_OFFSET), - getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIOC_PPDSR)); + getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIO_PPDSR_OFFSET)); #endif lldbg(" PUSR: %08x SCDR: %08x OWSR: %08x AIMMR: %08x\n", getreg32(base + SAM_PIO_PUSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET), @@ -528,7 +526,7 @@ int sam_dumpgpio(uint32_t pinset, const char *msg) getreg32(base + SAM_PIO_PCISR_OFFSET), getreg32(base + SAM_PIO_PCRHR_OFFSET)); #ifdef CONFIG_ARCH_CHIP_SAM4E lldbg("SCHMITT: %08x DELAYR:%08x\n", - getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DELAY_OFFSET)); + getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DELAYR_OFFSET)); #else lldbg("SCHMITT: %08x\n", getreg32(base + SAM_PIO_SCHMITT_OFFSET)); diff --git a/nuttx/configs/sam4e-ek/README.txt b/nuttx/configs/sam4e-ek/README.txt index 44fec94e4..4e5369209 100644 --- a/nuttx/configs/sam4e-ek/README.txt +++ b/nuttx/configs/sam4e-ek/README.txt @@ -1440,7 +1440,12 @@ Configurations only discusses PDC-based HSMCI DMA (although there is a DMA channel interface definition for HSMCI). So this is effort is dead-in-the-water for now. + 2014-05-15: The HSCMCI driver has been recently updated to support + PCD DMA. That modified driver, however, has not yet + been tested with the SAM4E-EK + 2014-05-14: The touchscreen interface was successfully verified. + 2014-05-14: The LCD interface is fully implemented. However, there is still a bug in in the LCD communications. The LCD ID is read as 0x0000 instead of 0x9325. |