X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-des-test.c;h=5ccf7b66204a28bc30a524f065bd8f8c0df33f29;hb=bd9d6731486cac11f6b294b3c84681eb65947f3d;hp=349c2903d7152cf8090b2c1eb9844c9b363a8cd2;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git diff --git a/test_src/main-des-test.c b/test_src/main-des-test.c index 349c290..5ccf7b6 100644 --- a/test_src/main-des-test.c +++ b/test_src/main-des-test.c @@ -23,7 +23,7 @@ #include "config.h" #include "serial-tools.h" -#include "uart.h" +#include "uart_i.h" #include "debug.h" #include "des.h" @@ -81,17 +81,17 @@ void testrun_performance_des(void){ startTimer(1); des_enc(data, data, key); 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); des_dec(data, data, key); 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); - uart_putstr_P(PSTR("\r\n")); + cli_putstr(str); + cli_putstr_P(PSTR("\r\n")); } /***************************************************************************** * main @@ -112,13 +112,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); } }