diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-13 17:32:37 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-13 17:32:37 +0000 |
| commit | 5be9588ed42d1a4ed297bdc76d9e05e582e78969 (patch) | |
| tree | a975a5a0d60e1cd2255ba0bd3ed397c72dc4745d /nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c | |
| parent | 1125cbdc2d38da82d9631aa0ae1d9030f641126e (diff) | |
| download | px4-nuttx-5be9588ed42d1a4ed297bdc76d9e05e582e78969.tar.gz px4-nuttx-5be9588ed42d1a4ed297bdc76d9e05e582e78969.tar.bz2 px4-nuttx-5be9588ed42d1a4ed297bdc76d9e05e582e78969.zip | |
Fixe to kernel build and syscalls.
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5738 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c')
| -rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c index f52a9a35e..b38061404 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c @@ -1546,7 +1546,7 @@ static void lpc17_widebus(FAR struct sdio_dev_s *dev, bool wide) static void lpc17_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) { - uint32_t clock; + uint32_t clkcr; switch (rate) { @@ -1554,39 +1554,39 @@ static void lpc17_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) default: case CLOCK_SDIO_DISABLED: - clock = LPC17_CLCKCR_INIT; + clkcr = LPC17_CLCKCR_INIT; return; /* Enable in initial ID mode clocking (<400KHz) */ case CLOCK_IDMODE: - clock = (LPC17_CLCKCR_INIT | SDCARD_CLOCK_CLKEN); + clkcr = (LPC17_CLCKCR_INIT | SDCARD_CLOCK_CLKEN); break; /* Enable in MMC normal operation clocking */ case CLOCK_MMC_TRANSFER: - clock = (SDCARD_CLOCK_MMCXFR | SDCARD_CLOCK_CLKEN); + clkcr = (SDCARD_CLOCK_MMCXFR | SDCARD_CLOCK_CLKEN); break; /* SD normal operation clocking (wide 4-bit mode) */ case CLOCK_SD_TRANSFER_4BIT: #ifndef CONFIG_SDIO_WIDTH_D1_ONLY - clock = (SDCARD_CLOCK_SDWIDEXFR | SDCARD_CLOCK_CLKEN); + clkcr = (SDCARD_CLOCK_SDWIDEXFR | SDCARD_CLOCK_CLKEN); break; #endif /* SD normal operation clocking (narrow 1-bit mode) */ case CLOCK_SD_TRANSFER_1BIT: - clock = (SDCARD_CLOCK_SDXFR | SDCARD_CLOCK_CLKEN); + clkcr = (SDCARD_CLOCK_SDXFR | SDCARD_CLOCK_CLKEN); break; } /* Set the new clock frequency along with the clock enable/disable bit */ - lpc17_setclock(clock); + lpc17_setclock(clkcr); } /**************************************************************************** |