diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-05-19 12:11:36 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-05-19 12:11:36 +0000 |
| commit | 76134c517da69752e4b04d6ad76f1f79db1123e3 (patch) | |
| tree | 87de0554151fd658872d7b9f49e63bc2720d68a2 /c/src/lib/libbsp/arm/lpc32xx/misc | |
| parent | 2011-05-19 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-76134c517da69752e4b04d6ad76f1f79db1123e3.tar.bz2 | |
2011-05-19 Sebastian Huber <sebastian.huber@embedded-brains.de>
* Makefile.am, preinstall.am: Install new header files.
* include/bsp.h, include/emc.h, include/lpc32xx.h, misc/emc.c: Update
for API changes.
Diffstat (limited to 'c/src/lib/libbsp/arm/lpc32xx/misc')
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc32xx/misc/emc.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/arm/lpc32xx/misc/emc.c b/c/src/lib/libbsp/arm/lpc32xx/misc/emc.c index c03aed0052..b9e8152e47 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/misc/emc.c +++ b/c/src/lib/libbsp/arm/lpc32xx/misc/emc.c @@ -24,7 +24,9 @@ #include <bsp.h> #include <bsp/mmu.h> -static volatile lpc32xx_emc *const emc = &lpc32xx.emc; +static volatile lpc_emc *const emc = &lpc32xx.emc; + +static volatile lpc32xx_emc_ahb *const emc_ahb = &lpc32xx.emc_ahb [0]; static void dynamic_init(const lpc32xx_emc_dynamic_config *cfg) { @@ -95,17 +97,17 @@ void lpc32xx_emc_init(const lpc32xx_emc_dynamic_config *dyn_cfg) LPC32XX_HCLKDIV_CTRL |= HCLK_DIV_DDRAM_CLK(1); /* Enable buffers in AHB ports */ - emc->ahb [0].control = EMC_AHB_PORT_BUFF_EN; - emc->ahb [3].control = EMC_AHB_PORT_BUFF_EN; - emc->ahb [4].control = EMC_AHB_PORT_BUFF_EN; + emc_ahb [0].control = EMC_AHB_PORT_BUFF_EN; + emc_ahb [3].control = EMC_AHB_PORT_BUFF_EN; + emc_ahb [4].control = EMC_AHB_PORT_BUFF_EN; /* Set AHB port timeouts */ - emc->ahb [0].timeout = EMC_AHB_TIMEOUT(32); - emc->ahb [3].timeout = EMC_AHB_TIMEOUT(32); - emc->ahb [4].timeout = EMC_AHB_TIMEOUT(32); + emc_ahb [0].timeout = EMC_AHB_TIMEOUT(32); + emc_ahb [3].timeout = EMC_AHB_TIMEOUT(32); + emc_ahb [4].timeout = EMC_AHB_TIMEOUT(32); /* Enable EMC */ - emc->control = EMC_CTRL_EN, + emc->control = EMC_CTRL_E, emc->config = 0; dynamic_init(dyn_cfg); |