a lot of fixes

[avr-crypto-lib.git] / test_src / main-shacal1_enc-test.c

diff --git a/test_src/main-shacal1_enc-test.c b/test_src/main-shacal1_enc-test.c
index b36ef867aceb882776598f5b7b86406db704f506..48b5051dc7c81f6e9fa0caecb858f4462b45132c 100644 (file)
--- a/test_src/main-shacal1_enc-test.c
+++ b/test_src/main-shacal1_enc-test.c
@@ -22,8 +22,8 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "shacal1_enc.h"
@@ -76,7 +76,7 @@ void testrun_performance_shacal1enc(void){
        t = stopTimer();
        print_time_P(PSTR("\tencrypt time: "), t);
        
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(PSTR("\r\n"));
 }
 
 /*****************************************************************************
@@ -88,7 +88,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_shacal1enc},
        { test_str,        NULL, testrun_nessie_shacal1enc},
        { performance_str, NULL, testrun_performance_shacal1enc},
@@ -98,13 +98,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);
        }
 }