X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-rc5-test.c;h=e154020e948117cdf42b26b94c19fbc91897bae6;hb=52ec168ece9d61bd9cb652235dfe8faee6232a11;hp=a81158a91503a554837635f861bc73757081a736;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-rc5-test.c b/test_src/main-rc5-test.c
index a81158a..e154020 100644
--- a/test_src/main-rc5-test.c
+++ b/test_src/main-rc5-test.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "serial-tools.h"
-#include "uart.h"
+#include "uart_i.h"
 #include "debug.h"
 
 #include "rc5.h"
@@ -75,31 +75,31 @@ void testrun_performance_rc5(void){
 	startTimer(1);
 	rc5_init(key, 128, RC5_ROUNDS, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);	
+	cli_putstr(str);	
 	
 	startTimer(1);
 	rc5_enc(data, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 	
 	startTimer(1);
 	rc5_dec(data, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
+	cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 
 	startTimer(1);
 	rc5_free(&ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tfree time: "));
+	cli_putstr_P(PSTR("\r\n\tfree time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr(str);
+	cli_putstr_P(PSTR("\r\n"));
 }
 /*****************************************************************************
  *  main																	 *
@@ -120,13 +120,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 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);
 	}
 }