From: Jakob Gruber Date: Thu, 2 Aug 2012 08:05:02 +0000 (+0200) Subject: timer: Remove trace_flags X-Git-Tag: v1.0~29 X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=3e0d79d77aba4f3aa7728ad58b904da06a8b31ae;p=sx%2Fsimavr.git timer: Remove trace_flags All uses have been converted to AVR_LOG(). --- diff --git a/simavr/sim/avr_timer.c b/simavr/sim/avr_timer.c index 7d09b3f..aeda219 100644 --- a/simavr/sim/avr_timer.c +++ b/simavr/sim/avr_timer.c @@ -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; } diff --git a/simavr/sim/avr_timer.h b/simavr/sim/avr_timer.h index 22244e0..7cb236f 100644 --- a/simavr/sim/avr_timer.h +++ b/simavr/sim/avr_timer.h @@ -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