switching to new main-*-test layout and to stdio streams

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

diff --git a/test_src/main-bmw-test.c b/test_src/main-bmw-test.c
index a78e1a5d6304501459b700ec9dc9895852a762d8..18d91a68ff3cc891c79fafeb751335b6f60f4a3e 100644 (file)
--- a/test_src/main-bmw-test.c
+++ b/test_src/main-bmw-test.c
@@ -21,25 +21,19 @@
  *
 */
 
-#include "config.h"
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "bmw_small.h"
 #include "bmw_large.h"
-#include "cli.h"
 #include "hfal_bmw_small.h"
 #include "hfal_bmw_large.h"
+
 #include "shavs.h"
 #include "nessie_hash_test.h"
-#include "performance_test.h"
 #include "hfal-nessie.h"
 #include "hfal-performance.h"
 #include "hfal-test.h"
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+#include "performance_test.h"
 
 char* algo_name = "BlueMidnightWish";
 
@@ -173,21 +167,12 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
+    main_setup();
 
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;
-       shavs_algolist=(hfdesc_t**)algolist;
+    shavs_algolist=(hfdesc_t**)algolist;
        shavs_algo=(hfdesc_t*)&bmw256_desc;
        for(;;){
-               cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               cli_putstr(algo_name);
-               cli_putstr_P(PSTR("; "));
-               cli_putstr(__DATE__);
-               cli_putstr_P(PSTR(" "));
-               cli_putstr(__TIME__);
-               cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
+           welcome_msg(algo_name);
                cmd_interface(cmdlist);
        }
 }