X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-skein-test.c;h=4b9fdff5a190ba24471def87c3e1220b21dd68a5;hb=fb928c1c4c392b9e987631f84f1027af94e05beb;hp=3a1d9258440f9091f32f0d483681fa09d4f900dc;hpb=d70d1d77bab1a5f5278227d674bc59da0378fe15;p=arm-crypto-lib.git

diff --git a/test_src/main-skein-test.c b/test_src/main-skein-test.c
index 3a1d925..4b9fdff 100644
--- a/test_src/main-skein-test.c
+++ b/test_src/main-skein-test.c
@@ -21,36 +21,20 @@
  *
 */
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include "config.h"
-#include "cli.h"
-#include "dump.h"
-#include "uart_lowlevel.h"
-#include "sysclock.h"
-#include "hw_gptm.h"
+#include "main-test-common.h"
 
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-basic.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include "skein.h"
-#include "hfal/hfal_skein256.h"
-#include "hfal/hfal_skein512.h"
-#include "hfal/hfal_skein1024.h"
-
-
-void uart0_putc(char byte){
-	uart_putc(UART_0, byte);
-}
-
-char uart0_getc(void){
-	return uart_getc(UART_0);
-}
+#include "hfal_skein256.h"
+#include "hfal_skein512.h"
+#include "hfal_skein1024.h"
 
 const char* algo_name = "Skein";
 
@@ -284,26 +268,13 @@ cmdlist_entry_t cmdlist[]  = {
 };
 
 int main(void) {
-	sysclk_set_freq(SYS_FREQ);
-	sysclk_mosc_verify_enable();
-    uart_init(UART_0, 115200, 8, UART_PARATY_NONE, UART_STOPBITS_ONE);
-    gptm_set_timer_32periodic(TIMER0);
-
-	cli_rx = uart0_getc;
-    cli_tx = uart0_putc;
-
+	main_setup();
 	shavs_algolist=(hfdesc_t**)algolist;
 	shavs_algo=(hfdesc_t*)&skein256_256_desc;
 
 	for(;;){
-		cli_putstr("\r\n\r\nARM-Crypto-Lib VS (");
-		cli_putstr(algo_name);
-		cli_putstr("; ");
-		cli_putstr(__DATE__);
-		cli_putc(' ');
-		cli_putstr(__TIME__);
-		cli_putstr(")\r\nloaded and running\r\n");
-    	cmd_interface(cmdlist);
+		welcome_msg(algo_name);
+		cmd_interface(cmdlist);
     }
 
 }