adjusting test system uart reference

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

diff --git a/test_src/main-trivium-test.c b/test_src/main-trivium-test.c
index 9961222866467175002d672646a78a7ff534dd1e..b131830807d4c7a38602ec1c85094a8f49fb560b 100644 (file)
--- a/test_src/main-trivium-test.c
+++ b/test_src/main-trivium-test.c
@@ -17,15 +17,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * Mickey128 test-suit
+ * Trivium test-suit
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
-#include "cli.h"
+#include "main-test-common.h"
 
 #include "trivium.h"
 #include "scal_trivium.h"
@@ -33,11 +29,7 @@
 #include "scal-nessie.h"
 #include "performance_test.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "Trivium";
+char *algo_name = "Trivium";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -134,7 +126,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_trivium},
        { test_str,        NULL, testrun_trivium},
        { performance_str, NULL, testrun_performance_trivium},
@@ -143,14 +135,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);
        }
 }