sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

back out part of last change

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1785 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-05-15 22:32:31 +00:00
parent 5e8842f1d7
commit 4a339ab6a3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/src/lm3s/lm3s_syscontrol.c
View File

@ -210,10 +210,9 @@ void lm3s_clockconfig(uint32 newrcc, uint32 newrcc2)
if (((rcc & SYSCON_RCC_MOSCDIS) && !(newrcc & SYSCON_RCC_MOSCDIS)) || if (((rcc & SYSCON_RCC_MOSCDIS) && !(newrcc & SYSCON_RCC_MOSCDIS)) ||
((rcc & SYSCON_RCC_IOSCDIS) && !(newrcc & SYSCON_RCC_IOSCDIS))) ((rcc & SYSCON_RCC_IOSCDIS) && !(newrcc & SYSCON_RCC_IOSCDIS)))
{ {
/* Enable any selected osciallators */ /* Enable any selected osciallators (but don't disable any yet) */
rcc &= ~RCC_OSCMASK; rcc &= (~RCC_OSCMASK | (newrcc & RCC_OSCMASK));
rcc |= (newrcc & RCC_OSCMASK);
putreg32(rcc, LM3S_SYSCON_RCC); putreg32(rcc, LM3S_SYSCON_RCC);
/* Wait for the newly selected oscillator(s) to settle. This is tricky because /* Wait for the newly selected oscillator(s) to settle. This is tricky because