X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fsysclock.c;h=02e226c002a940a9834e97bbe9c8ee08b370e900;hb=8fa939d627fb6230610a38e6468cbc55d006216d;hp=acbfb29443eda12d2443230ac5ece5311c651cd5;hpb=5f46191d2615ebe2caa6e111b478031a34f20b9e;p=arm-crypto-lib.git

diff --git a/test_src/sysclock.c b/test_src/sysclock.c
index acbfb29..02e226c 100644
--- a/test_src/sysclock.c
+++ b/test_src/sysclock.c
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include "hw_regs.h"
-
+#include "sysclock.h"
 
 #define CRYSTAL_FREQ 16000000UL
 #define CRYSTAL_CODE 0x15 /* 16 MHz */
@@ -27,13 +27,15 @@
 #define PIOSC_FREQ 16000000UL
 
 void sysclk_set_rawclock(void){
-	uint32_t tmp_rcc;
+	volatile uint32_t tmp_rcc;
 	tmp_rcc = 0; //HW_REG(SYSCTL_BASE+RCC_OFFSET);
 	tmp_rcc &= ~(_BV(RCC_IOSCDIS) | _BV(RCC_MOSCDIS) | _BV(RCC_USESYSDIV));
 	tmp_rcc |= _BV(RCC_BYPASS) | _BV(RCC_PWRDN);
 	tmp_rcc &= ~(3<<RCC_OSCSRC);
 	tmp_rcc |=  (0<<RCC_OSCSRC);
 	HW_REG(SYSCTL_BASE+RCC_OFFSET) = tmp_rcc;
+//	tmp_rcc |= _BV(RCC_PWRDN);
+	HW_REG(SYSCTL_BASE+RCC_OFFSET) = tmp_rcc;
 	HW_REG(SYSCTL_BASE+RCC2_OFFSET) &= ~(_BV(31));
 
 }
@@ -46,7 +48,7 @@ void sysclk_mosc_verify_disable(void){
 	HW_REG(SYSCTL_BASE+MOSCCTL_OFFSET) &= ~1UL; // turn on main oscillator verify circuit
 }
 
-void sysclk_set_80MHz(void){
+void sysclk_set_freq(uint8_t freq_id){
 	uint32_t rcc1, rcc2=0;
 	sysclk_set_rawclock();
 	rcc1 = HW_REG(SYSCTL_BASE+RCC_OFFSET);
@@ -58,14 +60,19 @@ void sysclk_set_80MHz(void){
 	HW_REG(SYSCTL_BASE+RCC2_OFFSET) = rcc2;
 	rcc2 &= ~_BV(RCC2_PWRDN2);
 	HW_REG(SYSCTL_BASE+RCC2_OFFSET) = rcc2;
-	rcc2 |= _BV(RCC2_DIV400) | 0x04<<RCC2_SYSDIV2LSB;
+	rcc2 |= _BV(RCC2_DIV400) | (freq_id<<RCC2_SYSDIV2LSB);
 	HW_REG(SYSCTL_BASE+RCC2_OFFSET) = rcc2;
 	while(!(HW_REG(SYSCTL_BASE+RIS_OFFSET)&_BV(RIS_PLLLRIS))){
 	}
+//	return;
 	rcc2 &= ~_BV(RCC2_BYPASS2);
 	HW_REG(SYSCTL_BASE+RCC2_OFFSET) = rcc2;
 }
 
+void sysclk_set_80MHz(void){
+	sysclk_set_freq(SYS_FREQ_80MHZ000);
+}
+
 uint32_t sysclk_get_freq(void){
 	uint32_t rcc1, rcc2, basefreq=400000000UL, divider=1;
 	const uint32_t bypass_freq[] = {