removing old rsa

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

diff --git a/test_src/main-entropium-test.c b/test_src/main-entropium-test.c
index 95f3fc1136fb6ef8d6fdbc1111548f092f6ab598..92dc8efcfd3deae70bf2ad61ee05cb3e86cadb69 100644 (file)
--- a/test_src/main-entropium-test.c
+++ b/test_src/main-entropium-test.c
@@ -22,8 +22,8 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "entropium.h"
@@ -45,7 +45,7 @@ void testrun_entropium(void){
        char c, str[16];
        uint8_t data[32];
        uint32_t i=0;
-       while(!uart_getc_nb(&c)){
+       while('q'!=cli_getc()){
                entropium_getRandomBlock(data);
                cli_putstr_P(PSTR("\r\n "));
                ultoa(i, str, 10);
@@ -95,7 +95,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_entropium},
        { test_str,        NULL, testrun_entropium},
        { performance_str, NULL, testrun_performance_entropium},
@@ -106,8 +106,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 ("));