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

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

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 48de3cf327ab1cd9bace25b7dd92039460681b7c..0d2fe022e47a5a16417900bb2ff802e09356fa00 100644 (file)
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -21,24 +21,15 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "skipjack.h"
 #include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_skipjack.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-
 char* algo_name = "Skipjack";
 
 const bcdesc_t* const algolist[] PROGMEM = {
@@ -175,14 +166,10 @@ 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;                
-       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);
        }
 }