Commit 3e0d79d77aba4f3aa7728ad58b904da06a8b31ae
authorJakob Gruber <jakob.gruber@gmail.com>
Thu, 2 Aug 2012 08:05:02 +0000 (10:05 +0200)
committerJakob Gruber <jakob.gruber@gmail.com>
Sun, 5 Aug 2012 11:00:53 +0000 (13:00 +0200)
All uses have been converted to AVR_LOG().

2 files changed:
simavr/sim/avr_timer.c
simavr/sim/avr_timer.h

index 7d09b3ff069de843921f2cf33c8a6ed0e54b2c25..aeda219430b57f5c3e6768a0df6eb6942eceb7de 100644 (file)
@@ -291,13 +291,7 @@ static void avr_timer_write_ocr(struct avr_t * avr, avr_io_addr_t addr, uint8_t
                        target = oi;
                        break;
                }
-       uint16_t otrace = p->trace_flags;
 
-       if (target != -1) {
-               p->trace_flags = 1 << target;
-       } else {
-               p->trace_flags = 0;
-       }
        switch (p->mode.kind) {
                case avr_timer_wgm_normal:
                        avr_timer_reconfigure(p);
@@ -325,7 +319,6 @@ static void avr_timer_write_ocr(struct avr_t * avr, avr_io_addr_t addr, uint8_t
                        avr_timer_reconfigure(p);
                        break;
        }
-       p->trace_flags = otrace;
 }
 
 static void avr_timer_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, void * param)
@@ -487,5 +480,4 @@ void avr_timer_init(avr_t * avr, avr_timer_t * p)
        }
        avr_register_io_write(avr, p->r_tcnt, avr_timer_tcnt_write, p);
        avr_register_io_read(avr, p->r_tcnt, avr_timer_tcnt_read, p);
-       p->trace_flags = 0xf;
 }
index 22244e03f0dab4210aed94105397949f018707ef..7cb236ff3f41872ca55ca8eb3dd8770ef22839b6 100644 (file)
@@ -92,7 +92,6 @@ typedef struct avr_timer_wgm_t {
 typedef struct avr_timer_t {
        avr_io_t        io;
        char name;
-       uint16_t                trace_flags;
 
        avr_regbit_t    disabled;       // bit in the PRR