global style change (now * is attached to identifier not to type)

[avr-crypto-lib.git] / test_src / performance_test.c

diff --git a/test_src/performance_test.c b/test_src/performance_test.c
index e371a5fc1c7951c0988a1bb5b211e5b48ae983d5..b3fff709ca54b3cc0d006063708bbafd9ff5a083 100644 (file)
--- a/test_src/performance_test.c
+++ b/test_src/performance_test.c
@@ -20,10 +20,10 @@
  * author: Daniel Otte
  * email:  daniel.otte@rub.de
  * license: GPLv3
- * 
- * 
+ *
+ *
  **/
- 
+
 #include "config.h"
 #include <string.h>
 #include <stdint.h>
@@ -31,7 +31,7 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <avr/pgmspace.h>
-#include "uart.h"
+#include "cli.h"
 #include "performance_test.h"
 
 
@@ -41,17 +41,17 @@
 
 
 
-uint32_t ovfcounter;
+static volatile uint32_t ovfcounter;
 
-uint16_t const_overhead=0;
-uint16_t int_overhead=0;
+static uint16_t const_overhead=0;
+static uint16_t int_overhead=0;
 
 ISR(TIMER1_OVF_vect){
        ovfcounter++;
 }
 
 void calibrateTimer(void){
-       volatile uint8_t i;
+       volatile uint8_t i=0;
        startTimer(1);
        stopTimer();
        const_overhead = TCNT1;
@@ -67,46 +67,45 @@ void startTimer(uint8_t granularity){
        TCNT1  = 0;
        ovfcounter = 0;
        TCCR1A = 0x00;
-       TIMSK &= 0xC3;
-       TIMSK |= _BV(TOIE1); /* enable TOIE1 */
+       TIMSK  = _BV(TOIE1); /* enable TOIE1 */
        TCCR1B = granularity & 0x7;     /* start timer */
 }
 
 uint64_t stopTimer(void){
        TCCR1B = 0; /* stop timer */
        uint64_t ret;
-       ret = (ovfcounter<<16) | TCNT1;
+       ret = (((uint64_t)ovfcounter)<<16) | TCNT1;
        ret -= const_overhead;
        ret -= ovfcounter * int_overhead;
        return ret;
 }
 
-void getOverhead(uint16_t* constoh, uint16_t* intoh){
+void getOverhead(uint16_t *constoh, uint16_t *intoh){
        *constoh = const_overhead;
-       *intoh   = int_overhead; 
+       *intoh   = int_overhead;
 }
 
 void print_time_P(PGM_P s, uint64_t t){
        char sv[16];
        uint8_t c;
-       uart_putstr_P(PSTR("\r\n"));
-       uart_putstr_P(s);
+       cli_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(s);
        ultoa((unsigned long)t, sv, 10);
        for(c=strlen(sv); c<11; ++c){
-               uart_putc(' ');
+               cli_putc(' ');
        }
-       uart_putstr(sv);
+       cli_putstr(sv);
 }
 
 void print_overhead(void){
        char str[16];
-       uart_putstr_P(PSTR("\r\n\r\n=== benchmark ==="));
+       cli_putstr_P(PSTR("\r\n\r\n=== benchmark ==="));
        utoa(const_overhead, str, 10);
-       uart_putstr_P(PSTR("\r\n\tconst overhead:     "));
-       uart_putstr(str);
+       cli_putstr_P(PSTR("\r\n\tconst overhead:     "));
+       cli_putstr(str);
        utoa(int_overhead, str, 10);
-       uart_putstr_P(PSTR("\r\n\tinterrupt overhead: "));
-       uart_putstr(str);
+       cli_putstr_P(PSTR("\r\n\tinterrupt overhead: "));
+       cli_putstr(str);
 }