Fix bug - Timer EGR register was using wrong value

beckus · beckus · commit d5e92d3b6b07 · 2015-06-06T00:26:44.000-04:00
diff --git a/hw/timer/stm32_timer.c b/hw/timer/stm32_timer.c
@@ -343,11 +343,11 @@ static void stm32_timer_write(void * opaque, hwaddr offset,
 		break;
 	case TIMER_EGR_OFFSET:
 		s->egr = value & 0x1E;
-		if (s->egr & 0x40) {
+		if (value & 0x40) {
 			/* TG bit */
 			s->sr |= 0x40;
 		}
-		if (s->egr & 0x1) {
+		if (value & 0x1) {
 			 /* UG bit - reload count */
 			ptimer_set_limit(s->timer, s->arr, 1);
 		}

Original file line number	Diff line number	Diff line change
`@@ -343,11 +343,11 @@ static void stm32_timer_write(void * opaque, hwaddr offset,`
`343`	`343`	`break;`
`344`	`344`	`case TIMER_EGR_OFFSET:`
`345`	`345`	`s->egr = value & 0x1E;`
`346`		`- if (s->egr & 0x40) {`
	`346`	`+ if (value & 0x40) {`
`347`	`347`	`/* TG bit */`
`348`	`348`	`s->sr \|= 0x40;`
`349`	`349`	`}`
`350`		`- if (s->egr & 0x1) {`
	`350`	`+ if (value & 0x1) {`
`351`	`351`	`/* UG bit - reload count */`
`352`	`352`	`ptimer_set_limit(s->timer, s->arr, 1);`
`353`	`353`	`}`