Fix node id helper methods

ethanbb · ethanbb · commit ce9a7ba219b8 · 2019-08-28T23:33:49.000-04:00
diff --git a/Source/Processors/GenericProcessor/GenericProcessor.cpp b/Source/Processors/GenericProcessor/GenericProcessor.cpp
@@ -1275,12 +1275,12 @@ uint32 GenericProcessor::getProcessorFullId(uint16 sid, uint16 subid)
 
 uint16 GenericProcessor::getNodeIdFromFullId(uint32 fid)
 {
-	return (fid && 0xFF00 ) >> 16;
+	return (fid & 0xFFFF0000 ) >> 16;
 }
 
 uint16 GenericProcessor::getSubProcessorFromFullId(uint32 fid)
 {
-	return (fid && 0x00FF);
+	return (fid & 0x0000FFFF);
 }
 
 int64 GenericProcessor::getLastProcessedsoftwareTime() const

Original file line number	Diff line number	Diff line change
`@@ -1275,12 +1275,12 @@ uint32 GenericProcessor::getProcessorFullId(uint16 sid, uint16 subid)`
`1275`	`1275`
`1276`	`1276`	`uint16 GenericProcessor::getNodeIdFromFullId(uint32 fid)`
`1277`	`1277`	`{`
`1278`		`- return (fid && 0xFF00 ) >> 16;`
	`1278`	`+ return (fid & 0xFFFF0000 ) >> 16;`
`1279`	`1279`	`}`
`1280`	`1280`
`1281`	`1281`	`uint16 GenericProcessor::getSubProcessorFromFullId(uint32 fid)`
`1282`	`1282`	`{`
`1283`		`- return (fid && 0x00FF);`
	`1283`	`+ return (fid & 0x0000FFFF);`
`1284`	`1284`	`}`
`1285`	`1285`
`1286`	`1286`	`int64 GenericProcessor::getLastProcessedsoftwareTime() const`