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

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

diff --git a/test_src/main-twister-test.c b/test_src/main-twister-test.c
index 2ac3180795f340c23fde9164d1c425247f1e9a6b..6e23154ed378cb2ce3ef71d83d5c8c9fabfa5ac4 100644 (file)
--- a/test_src/main-twister-test.c
+++ b/test_src/main-twister-test.c
@@ -21,10 +21,8 @@
  * 
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "twister-small.h"
 #include "twister-large.h"
@@ -39,12 +37,6 @@
 #include "hfal-test.h"
 #include "shavs.h"
 
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cli.h"
-
 char* algo_name = "TWISTER";
 
 const hfdesc_t* const algolist[] PROGMEM = {
@@ -139,16 +131,13 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
-       
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;                
-       shavs_algolist=(hfdesc_t**)algolist;
+    main_setup();
+
+    shavs_algolist=(hfdesc_t**)algolist;
        shavs_algo=(hfdesc_t*)&twister256_desc;
+       
        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);
+           welcome_msg(algo_name);
+           cmd_interface(cmdlist);
        }
 }