X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Fclock_lm3s.c;h=0cd5da8415b9f555b7321fd7835bdb212195a99b;hb=6447257f41c6d0f3d6b7a486e2683f930a5afdd3;hp=b91b09bd17625b959e8c214a3d51f33cb5d12cf7;hpb=73a7e9cb144007905b5b9de8e3086423e79b6d71;p=bertos.git

diff --git a/bertos/cpu/cortex-m3/drv/clock_lm3s.c b/bertos/cpu/cortex-m3/drv/clock_lm3s.c
index b91b09bd..0cd5da84 100644
--- a/bertos/cpu/cortex-m3/drv/clock_lm3s.c
+++ b/bertos/cpu/cortex-m3/drv/clock_lm3s.c
@@ -37,7 +37,7 @@
 
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
-#include "io/lm3s.h"
+#include <io/lm3s.h>
 #include "clock_lm3s.h"
 
 /* The PLL VCO frequency is 400 MHz */
@@ -51,23 +51,44 @@
 /*
  * Very small delay: each loop takes 3 cycles.
  */
-INLINE void __delay(unsigned long iterations)
+void NAKED lm3s_busyWait(unsigned long iterations)
 {
+	register uint32_t __n asm("r0") = iterations;
+
 	asm volatile (
-		"1:	subs	%0, #1\n\t"
-		"	bne 1b\n\t"
-		: "=r"(iterations) : : "memory", "cc");
+		"1: subs r0, #1\n\t"
+		"bne 1b\n\t"
+		"bx lr\n\t"
+		: : "r"(__n) : "memory", "cc");
 }
 
-unsigned long clock_get_rate(void)
+INLINE unsigned long clock_get_rate(void)
 {
 	reg32_t rcc = HWREG(SYSCTL_RCC);
 
 	return rcc & SYSCTL_RCC_USESYSDIV ?
-			PLL_VCO / RCC_TO_DIV(rcc) : PLL_VCO;
+			PLL_VCO / 2 / RCC_TO_DIV(rcc) : PLL_VCO;
 }
 
-void clock_set_rate(void)
+/*
+ * Try to evaluate the correct SYSDIV value depending on the desired CPU
+ * frequency.
+ */
+INLINE int evaluate_sysdiv(unsigned long freq)
+{
+	int i;
+
+	 /*
+	  * NOTE: with BYPASS=0, SYSDIV < 3 are reserved values (see LM3S1968
+	  * Microcontroller DATASHEET, p.78).
+	  */
+	for (i = 3; i < 16; i++)
+		if (freq >= (PLL_VCO / 2 / (i + 1)))
+			break;
+	return i;
+}
+
+void clock_init(void)
 {
 	reg32_t rcc, rcc2;
 	unsigned long clk;
@@ -92,6 +113,8 @@ void clock_set_rate(void)
 	HWREG(SYSCTL_RCC) = rcc;
 	HWREG(SYSCTL_RCC) = rcc2;
 
+	lm3s_busyWait(16);
+
 	/*
 	 * Step #2: select the crystal value (XTAL) and oscillator source
 	 * (OSCSRC), and clear the PWRDN bit in RCC/RCC2. Setting the XTAL
@@ -116,7 +139,7 @@ void clock_set_rate(void)
         HWREG(SYSCTL_RCC) = rcc;
 	HWREG(SYSCTL_RCC) = rcc2;
 
-	__delay(16);
+	lm3s_busyWait(16);
 
 	/*
 	 * Step #3: select the desired system divider (SYSDIV) in RCC/RCC2 and
@@ -125,19 +148,12 @@ void clock_set_rate(void)
 	 */
 	rcc &= ~(SYSCTL_RCC_SYSDIV_M | SYSCTL_RCC_USESYSDIV);
 
-	/*
-	 * Try to evaluate the correct SYSDIV value depending on the desired
-	 * CPU frequency.
-	 *
-	 * NOTE: with BYPASS=0, SYSDIV < 3 are reserved values (see LM3S1968
-	 * Microcontroller DATASHEET, p.78).
-	 */
 	clk = PLL_VCO / 2;
 	for (i = 3; i < 16; i++)
 		if (CPU_FREQ >= (clk / (i + 1)))
 			break;
-	if (i)
-		rcc |= SYSCTL_RCC_USESYSDIV | (i << SYSCTL_RCC_SYSDIV_SHIFT);
+	rcc |= SYSCTL_RCC_USESYSDIV |
+			(evaluate_sysdiv(CPU_FREQ) << SYSCTL_RCC_SYSDIV_SHIFT);
 
 	/*
 	 * Step #4: wait for the PLL to lock by polling the PLLLRIS bit in the
@@ -155,5 +171,5 @@ void clock_set_rate(void)
 
 	HWREG(SYSCTL_RCC) = rcc;
 
-	__delay(16);
+	lm3s_busyWait(16);
 }