X-Git-Url: https://git.cryptolib.org/?p=arm-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fsysclock.c;h=45d92178366027abb321151419feed1f7549830c;hp=acbfb29443eda12d2443230ac5ece5311c651cd5;hb=f59c19cdaa2b415ea72a30083ee7df085c2a6ae9;hpb=e0fbef3e36b457e05c8b7146a75c1d95e02b60ba

diff --git a/test_src/sysclock.c b/test_src/sysclock.c
index acbfb29..45d9217 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 */
@@ -46,7 +46,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,7 +58,7 @@ 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))){
 	}
@@ -66,6 +66,10 @@ void sysclk_set_80MHz(void){
 	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[] = {