X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=test_src%2Fmain-mickey128-test.c;h=927680a2e8fac890073eac9a1a29bb6a6ab7623c;hb=e7925dc3d2f76b73f54df0e22f69f789715eff8a;hp=9b629536ee42795933efe71c326e8a170fa9a5d7;hpb=2a5b018aa71694c5021f41e469234c3c5adb8784;p=avr-crypto-lib.git

diff --git a/test_src/main-mickey128-test.c b/test_src/main-mickey128-test.c
index 9b62953..927680a 100644
--- a/test_src/main-mickey128-test.c
+++ b/test_src/main-mickey128-test.c
@@ -3,20 +3,14 @@
  * 
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
-#include "cli.h"
+#include "main-test-common.h"
 
 #include "mickey128.h"
 #include "scal_mickey128.h"
 #include "scal-basic.h"
 #include "scal-nessie.h"
 
-#include <stdint.h>
-#include <string.h>
-
 char* algo_name = "Mickey128";
 
 /*****************************************************************************
@@ -24,6 +18,7 @@ char* algo_name = "Mickey128";
  *****************************************************************************/
 
 void testrun_nessie_mickey128(void){
+	scal_nessie_set_estream(1);
 	scal_nessie_run(&mickey128_desc);
 }
 
@@ -118,7 +113,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_mickey128},
 	{ test_str,        NULL, testrun_ref_mickey128},
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
@@ -126,14 +121,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);
 	}
 }