X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-trivium-test.c;h=bee2710cf82ca8a08d56ab0ac8287334f5a6c435;hb=4128060fcc4585ab8f40d01486baa4248b499160;hp=9961222866467175002d672646a78a7ff534dd1e;hpb=2a5b018aa71694c5021f41e469234c3c5adb8784;p=avr-crypto-lib.git

diff --git a/test_src/main-trivium-test.c b/test_src/main-trivium-test.c
index 9961222..bee2710 100644
--- a/test_src/main-trivium-test.c
+++ b/test_src/main-trivium-test.c
@@ -17,15 +17,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * Mickey128 test-suit
+ * Trivium test-suit
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
-#include "cli.h"
+#include "main-test-common.h"
 
 #include "trivium.h"
 #include "scal_trivium.h"
@@ -33,10 +29,6 @@
 #include "scal-nessie.h"
 #include "performance_test.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
 char* algo_name = "Trivium";
 
 /*****************************************************************************
@@ -134,7 +126,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_nessie_trivium},
 	{ test_str,        NULL, testrun_trivium},
 	{ performance_str, NULL, testrun_performance_trivium},
@@ -143,14 +135,10 @@ 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);
 	}
 }