fix shift

japaric · japaric · commit f47643305768 · 2018-10-26T19:52:53.000+02:00
diff --git a/src/peripheral/scb.rs b/src/peripheral/scb.rs
@@ -745,7 +745,7 @@ impl SCB {
         {
             // NOTE(unsafe) atomic read with no side effects
             let shpr = unsafe { (*Self::ptr()).shpr[usize::from((index - 8) / 4)].read() };
-            let prio = (shpr >> (index % 4)) & 0x000000ff;
+            let prio = (shpr >> (8 * (index % 4))) & 0x000000ff;
             prio as u8
         }
     }
@@ -773,7 +773,7 @@ impl SCB {
         #[cfg(armv6m)]
         {
             self.shpr[usize::from((index - 8) / 4)].modify(|value| {
-                let shift = index % 4;
+                let shift = 8 * (index % 4);
                 let mask = 0x000000ff << shift;
                 let prio = u32::from(prio) << shift;
 

Original file line number	Diff line number	Diff line change
`@@ -745,7 +745,7 @@ impl SCB {`
`745`	`745`	`{`
`746`	`746`	`// NOTE(unsafe) atomic read with no side effects`
`747`	`747`	`let shpr = unsafe { (*Self::ptr()).shpr[usize::from((index - 8) / 4)].read() };`
`748`		`- let prio = (shpr >> (index % 4)) & 0x000000ff;`
	`748`	`+ let prio = (shpr >> (8 * (index % 4))) & 0x000000ff;`
`749`	`749`	`prio as u8`
`750`	`750`	`}`
`751`	`751`	`}`
`@@ -773,7 +773,7 @@ impl SCB {`
`773`	`773`	`#[cfg(armv6m)]`
`774`	`774`	`{`
`775`	`775`	`self.shpr[usize::from((index - 8) / 4)].modify(\|value\| {`
`776`		`- let shift = index % 4;`
	`776`	`+ let shift = 8 * (index % 4);`
`777`	`777`	`let mask = 0x000000ff << shift;`
`778`	`778`	`let prio = u32::from(prio) << shift;`
`779`	`779`