X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-ubi-test.c;h=79ba647314941beaf931d2c4f35208772c18016b;hb=d72d6fbe7abbd26958657c877bc0a3dbef8148ce;hp=140362d5e584a042f3b313e5179c7df9c96dc897;hpb=56a151edecefbaeab43dac22c89a3bb9fe4f470e;p=avr-crypto-lib.git

diff --git a/test_src/main-ubi-test.c b/test_src/main-ubi-test.c
index 140362d..79ba647 100644
--- a/test_src/main-ubi-test.c
+++ b/test_src/main-ubi-test.c
@@ -21,20 +21,12 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "ubi.h"
-#include "cli.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "UBI-Threefish";
+char *algo_name = "UBI-Threefish";
 
 /*****************************************************************************
  *  additional validation-functions											 *
@@ -185,7 +177,7 @@ const char test_str[]        PROGMEM = "test";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 //	{ nessie_str,      NULL, testrun_nessie_noekeon},
 	{ test_str,        NULL, testrun_stdtest_ubi},
 //	{ performance_str, NULL, testrun_performance_noekeon},
@@ -194,14 +186,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	cli_rx = uart_getc;
-	cli_tx = uart_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);
 	}
 }