X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-twister256-test.c;h=2a54084b1d4333e404aabd7066f9609ff4ea35b9;hp=25ae0896f8bc134b549d5fbe4d87c917be3c9804;hb=572b35bb7409fb362441e0812cb62eab9f2411f0;hpb=17332291e15183d71d88ed868275e3cb53917180

diff --git a/test_src/main-twister256-test.c b/test_src/main-twister256-test.c
index 25ae089..2a54084 100644
--- a/test_src/main-twister256-test.c
+++ b/test_src/main-twister256-test.c
@@ -1,6 +1,6 @@
 /* main-twister256-test.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-Lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -178,29 +178,28 @@ void testrun_performance_twister256(void){
  * main																	 *
  *****************************************************************************/
 
-int main (void){
-	char str[20];
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
-	
-	DEBUG_INIT();
-	uart_putstr_P(PSTR("\r\n"));
+cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_twister256},
+	{ test_str,        NULL, testrun_twister256},
+	{ performance_str, NULL, testrun_performance_twister256},
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ NULL,            NULL, NULL}
+};
 
-	uart_putstr_P(PSTR("\r\n\r\nCrypto-VS (")); 
-	uart_putstr(algo_name);
-	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-	PGM_P    u   = PSTR("nessie\0test\0performance\0");
-	void_fpt v[] = { testrun_nessie_twister256, 
-                         testrun_twister256, 
-                         testrun_performance_twister256 };
-
-	while(1){ 
-		if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
-		if(execcommand_d0_P(str, u, v)<0){
-			uart_putstr_P(PSTR("\r\nunknown command\r\n"));
-		}
-		continue;
-	error:
-		uart_putstr("ERROR\r\n");
+int main (void){
+	DEBUG_INIT();
+	uart_putstr("\r\n");
+	cli_rx = uart_getc;
+	cli_tx = uart_putc;	 	
+	for(;;){
+		uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
+		uart_putstr(algo_name);
+		uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+		cmd_interface(cmdlist);
 	}
 }
-