some files were not adapted in the previous commit

[avr-crypto-lib.git] / test_src / main-shabea-test.c

diff --git a/test_src/main-shabea-test.c b/test_src/main-shabea-test.c
index 5a6c5fa273c1aa7d524f955b897e4b50722c6927..471881eac18c81fb40cb68cbf39e703e71f0d9a9 100644 (file)
--- a/test_src/main-shabea-test.c
+++ b/test_src/main-shabea-test.c
@@ -25,20 +25,13 @@
  * GPLv3 or later
  * 
  */
-#include "config.h"
-#include "serial-tools.h"
-#include "uart_i.h"
-#include "debug.h"
+
+#include "main-test-common.h"
 
 #include "shabea.h"
 #include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
 char* algo_name = "Shabea";
 
 /*****************************************************************************
@@ -171,7 +164,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_shabea},
        { test_str,        NULL, testrun_shabea},
        { performance_str, NULL, testrun_performance_shabea},
@@ -180,14 +173,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);
        }
 }