josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: silence warning in mbed-system_LPC11xx.c. 

No functional change, just moved declarations to a more
appropriate place.
This commit is contained in:
Markus Hitter 2015-07-22 21:55:08 +02:00
parent a336ae57e3
commit 32480bdfb6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mbed-system_LPC11xx.c
View File

@ -34,6 +34,9 @@
copies in the Teacup repo. copies in the Teacup repo.
- Wrapped the whole file in #ifdef __ARMEL__ to not cause conflicts with - Wrapped the whole file in #ifdef __ARMEL__ to not cause conflicts with
AVR builds. AVR builds.
- Silenced this warning:
system_LPC11xx.c:344:21: warning: unused variable 'i'
by declaring i directly where it's used and renaming the other to 'j'.
*/ */
#ifdef __ARMEL__ #ifdef __ARMEL__
@ -341,14 +344,13 @@ void SystemCoreClockUpdate (void) /* Get Core Clock Frequency */
* Initialize the System. * Initialize the System.
*/ */
void SystemInit (void) { void SystemInit (void) {
volatile uint32_t i;
#if (CLOCK_SETUP) /* Clock Setup */ #if (CLOCK_SETUP) /* Clock Setup */
#if ((SYSPLLCLKSEL_Val & 0x03) == 1) #if ((SYSPLLCLKSEL_Val & 0x03) == 1)
LPC_SYSCON->PDRUNCFG &= ~(1 << 5); /* Power-up System Osc */ LPC_SYSCON->PDRUNCFG &= ~(1 << 5); /* Power-up System Osc */
LPC_SYSCON->SYSOSCCTRL = SYSOSCCTRL_Val; LPC_SYSCON->SYSOSCCTRL = SYSOSCCTRL_Val;
for (i = 0; i < 200; i++) __NOP(); for (volatile uint32_t i = 0; i < 200; i++) __NOP();
#endif #endif
LPC_SYSCON->SYSPLLCLKSEL = SYSPLLCLKSEL_Val; /* Select PLL Input */ LPC_SYSCON->SYSPLLCLKSEL = SYSPLLCLKSEL_Val; /* Select PLL Input */
@ -365,7 +367,7 @@ void SystemInit (void) {
#if (((MAINCLKSEL_Val & 0x03) == 2) ) #if (((MAINCLKSEL_Val & 0x03) == 2) )
LPC_SYSCON->WDTOSCCTRL = WDTOSCCTRL_Val; LPC_SYSCON->WDTOSCCTRL = WDTOSCCTRL_Val;
LPC_SYSCON->PDRUNCFG &= ~(1 << 6); /* Power-up WDT Clock */ LPC_SYSCON->PDRUNCFG &= ~(1 << 6); /* Power-up WDT Clock */
for (i = 0; i < 200; i++) __NOP(); for (volatile uint32_t j = 0; j < 200; j++) __NOP();
#endif #endif
LPC_SYSCON->MAINCLKSEL = MAINCLKSEL_Val; /* Select PLL Clock Output */ LPC_SYSCON->MAINCLKSEL = MAINCLKSEL_Val; /* Select PLL Clock Output */