Skip to content

Commit dd250f2

Browse files
ntavishgalak
authored andcommitted
SPARC: fix issue with timer in QEMU machine AT697
Fixes following bug: `sdk-zephyr-qemu/git-r0/git/hw/core/ptimer.c:384: ptimer_transaction_commit: Assertion `s->in_transaction' failed.` I'm not sure if it's okay to just edit existing patch, or to add another, but editing existing patch for now.
1 parent de00f18 commit dd250f2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

meta-zephyr-sdk/recipes-devtools/qemu/files/0004-hw-sparc-leon-Switch-to-transaction-based-ptimer-API.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ index 8e38a33c62..f2e12d714f 100644
6060
case TIMER_1_COUNTER_REGISTER:
6161
+ ptimer_transaction_begin(s->timer1.ptimer);
6262
ret = ptimer_get_count(s->timer1.ptimer);
63-
+ ptimer_transaction_commit(s->timer2.ptimer);
63+
+ ptimer_transaction_commit(s->timer1.ptimer);
6464
break;
6565

6666
case TIMER_2_COUNTER_REGISTER:
67-
+ ptimer_transaction_begin(s->timer1.ptimer);
67+
+ ptimer_transaction_begin(s->timer2.ptimer);
6868
ret = ptimer_get_count(s->timer2.ptimer);
6969
+ ptimer_transaction_commit(s->timer2.ptimer);
7070
break;

0 commit comments

Comments
 (0)