Implemented correct behaviour for getTruncatedEv on XS2

George Roger · George Roger · commit c1d7c0ad8095 · 2018-05-30T14:46:20.000+01:00
diff --git a/lib/Resource.cpp b/lib/Resource.cpp
@@ -141,7 +141,11 @@ uint32_t EventableResource::getTruncatedEV(Thread &thread) const
 {
   if (EV == getID())
     return EV;
-  return (EV & 0xffff) | thread.getParent().getRamBase();
+  if (thread.getParent().getParent()->type == Node::Type::XS2_A) {
+    return EV;
+  } else {
+    return (EV & 0xffff) | thread.getParent().getRamBase();
+  }
 }
 
 void EventableResource::eventDisable(Thread &thread)

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,11 @@ uint32_t EventableResource::getTruncatedEV(Thread &thread) const`
`141`	`141`	`{`
`142`	`142`	`if (EV == getID())`
`143`	`143`	`return EV;`
`144`		`- return (EV & 0xffff) \| thread.getParent().getRamBase();`
	`144`	`+ if (thread.getParent().getParent()->type == Node::Type::XS2_A) {`
	`145`	`+ return EV;`
	`146`	`+ } else {`
	`147`	`+ return (EV & 0xffff) \| thread.getParent().getRamBase();`
	`148`	`+ }`
`145`	`149`	`}`
`146`	`150`
`147`	`151`	`void EventableResource::eventDisable(Thread &thread)`