X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-cast5-test.c;h=d23ba8a3b339f9f8bba6989c8f9934683016b7f2;hb=2c909fca2a13cd76a526515bda5d0292483d7a55;hp=26e8274de6326d6312d02561d35b8a8b56fcf1e8;hpb=d1181933dc28db92d787cf5604e2fc96ab0d8f9f;p=avr-crypto-lib.git

diff --git a/test_src/main-cast5-test.c b/test_src/main-cast5-test.c
index 26e8274..d23ba8a 100644
--- a/test_src/main-cast5-test.c
+++ b/test_src/main-cast5-test.c
@@ -21,25 +21,17 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include <cast5.h>
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_cast5.h"
-#include "cli.h"
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
 
-char* algo_name = "cast-128 (cast5)";
+char *algo_name = "cast-128 (cast5)";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&cast5_desc,
 	NULL
 };
@@ -163,7 +155,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_cast5},
 	{ test_str,        NULL, testrun_cast5},
 	{ performance_str, NULL, testrun_performance_cast5},
@@ -172,14 +164,10 @@ 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);
 	}
 }