adding mickey128

[arm-crypto-lib.git] / test_src / main-arcfour-test.c

diff --git a/test_src/main-arcfour-test.c b/test_src/main-arcfour-test.c
index 5a786e8b9fe23d081550180b45cb3c6eac97a2aa..5d7138d75e20b6fad74382b6d31dde1a601d274e 100644 (file)
--- a/test_src/main-arcfour-test.c
+++ b/test_src/main-arcfour-test.c
@@ -1,7 +1,7 @@
 /* main-arcfour-test.c */
 /*
     This file is part of the ARM-Crypto-Lib.
-    Copyright (C) 2006-2010  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,16 +20,7 @@
  * arcfour (RC4 compatible) test-suit
  * 
 */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include "config.h"
-#include "cli.h"
-#include "dump.h"
-#include "uart_lowlevel.h"
-#include "sysclock.h"
-#include "hw_gptm.h"
+#include "main-test-common.h"
 
 #include "arcfour.h"
 #include "scal_arcfour.h"
@@ -38,19 +29,9 @@
 #include "nessie_stream_test.h"
 #include "performance_test.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
 
 const char* algo_name = "Arcfour";
 
-void uart0_putc(char byte){
-       uart_putc(UART_0, byte);
-}
-
-char uart0_getc(void){
-       return uart_getc(UART_0);
-}
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -104,22 +85,10 @@ const cmdlist_entry_t cmdlist[] = {
 };
 
 int main (void){
-       sysclk_set_freq(SYS_FREQ);
-       sysclk_mosc_verify_enable();
-       uart_init(UART_0, 115200, 8, UART_PARATY_NONE, UART_STOPBITS_ONE);
-       gptm_set_timer_32periodic(TIMER0);
-
-       cli_rx = uart0_getc;
-       cli_tx = uart0_putc;
+       main_setup();
        
        for(;;){
-               cli_putstr("\r\n\r\nARM-Crypto-Lib VS (");
-               cli_putstr(algo_name);
-               cli_putstr("; ");
-               cli_putstr(__DATE__);
-               cli_putc(' ');
-               cli_putstr(__TIME__);
-               cli_putstr(")\r\nloaded and running\r\n");
+               welcome_msg(algo_name);
                cmd_interface(cmdlist);
        }
 }