X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-a5_1-test.c;h=34e6739cc0329bbabd53e4abaa8ad702edba06ea;hb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;hp=7afb223f81ae527b47367e82f077db415b304f95;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-a5_1-test.c b/test_src/main-a5_1-test.c
index 7afb223..34e6739 100644
--- a/test_src/main-a5_1-test.c
+++ b/test_src/main-a5_1-test.c
@@ -22,8 +22,8 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include <A5_1.h>
@@ -68,23 +68,23 @@ const char testkey_str[]     PROGMEM = "testkey";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
-	{ nessie_str,      NULL, testrun_nessie_a51 },
-/*	{ performance_str, NULL, testrun_performance_a51}, */
-	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
-	{ NULL,            NULL, NULL}
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_a51, NULL},
+/*	{ performance_str, NULL, testrun_performance_a51, NULL}, */
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl, NULL},
+	{ NULL,            NULL, NULL, NULL}
 };
 
 int main (void){
 	DEBUG_INIT();
-	uart_putstr("\r\n");
 	
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	
+	cli_rx = (cli_rx_fpt)uart0_getc;
+	cli_tx = (cli_tx_fpt)uart0_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"));
+		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);
 	}