X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-xtea-test.c;h=26a42a3785874530c5a211d10361ce08536df40a;hb=a45c328791dc391e6432051ee0c7972ef7fd8d9a;hp=778d9cdce7bee6644fced7a79bcff54a5f3c8417;hpb=b246a2a0589f234db6247255555df98f4c281c41;p=avr-crypto-lib.git

diff --git a/test_src/main-xtea-test.c b/test_src/main-xtea-test.c
index 778d9cd..26a42a3 100644
--- a/test_src/main-xtea-test.c
+++ b/test_src/main-xtea-test.c
@@ -21,10 +21,8 @@
  * 
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "xtea.h"
 #include "nessie_bc_test.h"
@@ -32,14 +30,10 @@
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_xtea.h"
-#include "cli.h"
-
-#include <stdint.h>
-#include <string.h>
 
 char* algo_name = "XTEA";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const algolist[] PROGMEM = {
 	(bcdesc_t*)&xtea_desc,
 	NULL
 };
@@ -82,7 +76,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_xtea},
 	{ test_str,        NULL, test_xtea},
 	{ performance_str, NULL, testrun_performance_xtea},
@@ -91,14 +85,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);
 	}
 }