X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-khazad-test.c;h=84e6086ba25a44cacf447e833767f410604407fe;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=b5449fe8034f24d0e9ef0d37e58ea9f05d374df6;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;p=avr-crypto-lib.git

diff --git a/test_src/main-khazad-test.c b/test_src/main-khazad-test.c
index b5449fe..84e6086 100644
--- a/test_src/main-khazad-test.c
+++ b/test_src/main-khazad-test.c
@@ -20,26 +20,17 @@
  * khazad test-suit
  * 
 */
-
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "khazad.h"
-#include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_khazad.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+char *algo_name = "Khazad";
 
-char* algo_name = "Khazad";
-
-const bcdesc_t* const algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&khazad_desc,
 	NULL
 };
@@ -113,14 +104,10 @@ const 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);
 	}
 }