a lot of fixes

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

diff --git a/test_src/main-twister-test.c b/test_src/main-twister-test.c
index 794c05467055541cc63895238a8fc046a77a42b5..2ac3180795f340c23fde9164d1c425247f1e9a6b 100644 (file)
--- a/test_src/main-twister-test.c
+++ b/test_src/main-twister-test.c
@@ -22,11 +22,12 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "twister-small.h"
+#include "twister-large.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
 #include "hfal_twister224.h"
@@ -46,7 +47,7 @@
 
 char* algo_name = "TWISTER";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
        (hfdesc_t*)&twister224_desc,
        (hfdesc_t*)&twister256_desc,
        (hfdesc_t*)&twister384_desc,
@@ -126,7 +127,7 @@ const char shavs_list_str[]  PROGMEM = "shavs_list";
 const char shavs_set_str[]   PROGMEM = "shavs_set";
 const char shavs_test1_str[] PROGMEM = "shavs_test1";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,          NULL, testrun_nessie_twister},
        { test_str,            NULL, testrun_twister},
        { performance_str,     NULL, testrun_performance_twister},
@@ -140,8 +141,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;                
        shavs_algolist=(hfdesc_t**)algolist;
        shavs_algo=(hfdesc_t*)&twister256_desc;
        for(;;){