X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-salsa20-test.c;h=fda3cf97b2336eef809338a4f379fd3604907f8e;hp=9e8bb2fdc71897b96778fe6769eedeec4f993b1c;hb=a45c328791dc391e6432051ee0c7972ef7fd8d9a;hpb=4655b60cc205079ebafec3db4a4b47f7a8336bda

diff --git a/test_src/main-salsa20-test.c b/test_src/main-salsa20-test.c
index 9e8bb2f..fda3cf9 100644
--- a/test_src/main-salsa20-test.c
+++ b/test_src/main-salsa20-test.c
@@ -18,23 +18,15 @@
 */
 
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "salsa20.h"
-#include "cli.h"
 #include "performance_test.h"
 
 #include "scal_salsa20.h"
 #include "scal-basic.h"
 #include "scal-nessie.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
 char* algo_name = "Salsa20";
 
 /*****************************************************************************
@@ -279,15 +271,11 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;
-	for(;;){
-		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		cli_putstr(algo_name);
-		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		cmd_interface(cmdlist);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }