clean up

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

diff --git a/test_src/main-xtea-test.c b/test_src/main-xtea-test.c
index a1dfd029bf37caf0c542f7588b5499df0d724100..6fae984d5948c90e9c53a74488064b4074170048 100644 (file)
--- a/test_src/main-xtea-test.c
+++ b/test_src/main-xtea-test.c
@@ -22,13 +22,15 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "xtea.h"
 #include "nessie_bc_test.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_xtea.h"
 #include "cli.h"
 
 #include <stdint.h>
@@ -36,6 +38,13 @@
 
 char* algo_name = "XTEA";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&xtea_desc,
+       NULL
+};
+
+/******************************************************************************/
+
 void xtea_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
        memcpy(ctx, key, (keysize+7)/8);
 }
@@ -61,26 +70,7 @@ void testrun_nessie_xtea(void){
 }
 
 void testrun_performance_xtea(void){
-       uint64_t t;
-       uint8_t key[16], data[8];
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 16);
-       memset(data, 0,  8);
-       
-       startTimer(1);
-       xtea_enc(data, data, key);
-       t = stopTimer();
-       print_time_P(PSTR("\tencrypt time: "), t);
-       
-       startTimer(1);
-       xtea_dec(data, data, key);
-       t = stopTimer();
-       print_time_P(PSTR("\tdecrypt time: "), t);
-       
-       uart_putstr_P(PSTR("\r\n"));
+       bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -102,13 +92,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);
        }
 }