X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-a5_1-test.c;h=6addf1aa8ee5fb44ff442b61b7e5bd1e7d8d4120;hb=a45c328791dc391e6432051ee0c7972ef7fd8d9a;hp=79e19caca4eed3a79980f433be43c22824fcd658;hpb=83d0614d8b17eac97f891f7de2bb3ef265751dea;p=avr-crypto-lib.git

diff --git a/test_src/main-a5_1-test.c b/test_src/main-a5_1-test.c
index 79e19ca..6addf1a 100644
--- a/test_src/main-a5_1-test.c
+++ b/test_src/main-a5_1-test.c
@@ -21,18 +21,11 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
-#include <A5_1.h>
+#include "A5_1.h"
 #include "nessie_stream_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include "cli.h"
-
 char* algo_name = "A5_1";
 
 /*****************************************************************************
@@ -68,7 +61,7 @@ const char testkey_str[]     PROGMEM = "testkey";
 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_a51, NULL},
 /*	{ performance_str, NULL, testrun_performance_a51, NULL}, */
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl, NULL},
@@ -76,16 +69,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+    main_setup();
 	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);
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 	
 }