a lot of fixes

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

diff --git a/test_src/main-shabea-test.c b/test_src/main-shabea-test.c
index c577b6b95d13f903014b95ea96d7147726a06848..5748b9499ac987de6032dbe83932bd2366d7289f 100644 (file)
--- a/test_src/main-shabea-test.c
+++ b/test_src/main-shabea-test.c
@@ -26,8 +26,8 @@
  * 
  */
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "shabea.h"
@@ -171,7 +171,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_shabea},
        { test_str,        NULL, testrun_shabea},
        { performance_str, NULL, testrun_performance_shabea},
@@ -182,8 +182,8 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 int main (void){
        DEBUG_INIT();
        
-       cli_rx = uart_getc;
-       cli_tx = uart_putc;             
+       cli_rx = (cli_rx_fpt)uart0_getc;
+       cli_tx = (cli_tx_fpt)uart0_putc;                
        for(;;){
                cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
                cli_putstr(algo_name);