adjusting test system uart reference

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

diff --git a/test_src/main-entropium-test.c b/test_src/main-entropium-test.c
index 3f62fb9e39252dce41f3adaf21e84a189377354e..812d2134683d4b54faa2463087381a71ead27aea 100644 (file)
--- a/test_src/main-entropium-test.c
+++ b/test_src/main-entropium-test.c
@@ -21,21 +21,13 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "entropium.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 = "Entropium";
+char *algo_name = "Entropium";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -45,19 +37,19 @@ void testrun_entropium(void){
        char c, str[16];
        uint8_t data[32];
        uint32_t i=0;
-       while(!uart_getc_nb(&c)){
+       while('q'!=cli_getc()){
                entropium_getRandomBlock(data);
-               uart_putstr_P(PSTR("\r\n "));
+               cli_putstr_P(PSTR("\r\n "));
                ultoa(i, str, 10);
                for(c=strlen(str); c<11; ++c){
-                       uart_putc(' ');
+                       cli_putc(' ');
                }
-               uart_putstr(str);
+               cli_putstr(str);
                ++i;
-               uart_putstr_P(PSTR(" : "));
-               uart_hexdump(data, 32);
+               cli_putstr_P(PSTR(" : "));
+               cli_hexdump(data, 32);
        }
-       uart_putstr_P(PSTR("\r\n\r\n"));
+       cli_putstr_P(PSTR("\r\n\r\n"));
 }
 
 
@@ -72,19 +64,19 @@ void testrun_performance_entropium(void){
        startTimer(1);
        entropium_addEntropy(128, data);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tadd entropy time: "));
+       cli_putstr_P(PSTR("\r\n\tadd entropy time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
+       cli_putstr(str);
        
        
        startTimer(1);
        entropium_getRandomBlock(data);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tget random time:  "));
+       cli_putstr_P(PSTR("\r\n\tget random time:  "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
+       cli_putstr(str);
        
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(PSTR("\r\n"));
 }
 /*****************************************************************************
  *  main                                                                                                                                        *
@@ -95,7 +87,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_entropium},
        { test_str,        NULL, testrun_entropium},
        { performance_str, NULL, testrun_performance_entropium},
@@ -105,14 +97,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
  
 
 int main (void){
-       DEBUG_INIT();
-       uart_putstr("\r\n");
-       cli_rx = uart_getc;
-       cli_tx = uart_putc;             
+    main_setup();
+
        for(;;){
-               uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               uart_putstr(algo_name);
-               uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-               cmd_interface(cmdlist);
+           welcome_msg(algo_name);
+           cmd_interface(cmdlist);
        }
 }