X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=test_src%2Fmain-mugi-test.c;h=f55bb7ae9706e3d1707c430ca6143635d63ee5c3;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hp=2255d1a6cf6f9a0c81a5f5e064b36236392c65d3;hpb=2dc047a070be7f0d64f4d4e7f4296a9650af07dc;p=avr-crypto-lib.git

diff --git a/test_src/main-mugi-test.c b/test_src/main-mugi-test.c
index 2255d1a..f55bb7a 100644
--- a/test_src/main-mugi-test.c
+++ b/test_src/main-mugi-test.c
@@ -1,7 +1,7 @@
 /* main-mugi-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,21 +21,13 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "mugi.h"
 #include "nessie_stream_test.h"
-#include "cli.h"
 #include "performance_test.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "MUGI";
+char *algo_name = "MUGI";
 
 /*****************************************************************************
  *  additional validation-functions											 *
@@ -118,7 +110,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_arcfour },
 	{ test_str,        NULL, testrun_mugi},
 	{ performance_str, NULL, testrun_performance_mugi},
@@ -127,15 +119,11 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	uart_putstr("\r\n");
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
-	for(;;){
-		uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		uart_putstr(algo_name);
-		uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		cmd_interface(cmdlist);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }