mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
fix offsets in one way counter implementation
This commit is contained in:
parent
2f3cf06c16
commit
f8967ebaec
1 changed files with 5 additions and 5 deletions
|
|
@ -92,7 +92,7 @@ pub struct OneWayCounter {
|
||||||
#[cfg(feature = "std")]
|
#[cfg(feature = "std")]
|
||||||
mapping: MemoryRange,
|
mapping: MemoryRange,
|
||||||
}
|
}
|
||||||
|
const COUNTER_STRIDE_U32: usize = 8;
|
||||||
impl OneWayCounter {
|
impl OneWayCounter {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
#[cfg(not(feature = "std"))]
|
#[cfg(not(feature = "std"))]
|
||||||
|
|
@ -120,7 +120,7 @@ impl OneWayCounter {
|
||||||
if offset < ONEWAY_LEN {
|
if offset < ONEWAY_LEN {
|
||||||
// safety: only safe because the pointer is length-checked
|
// safety: only safe because the pointer is length-checked
|
||||||
// we use this form to access the array because we need to read_volatile()
|
// we use this form to access the array because we need to read_volatile()
|
||||||
Ok(unsafe { base.add(offset).read_volatile() })
|
Ok(unsafe { base.add(offset * COUNTER_STRIDE_U32).read_volatile() })
|
||||||
} else {
|
} else {
|
||||||
Err(OneWayErr::OutOfBounds)
|
Err(OneWayErr::OutOfBounds)
|
||||||
}
|
}
|
||||||
|
|
@ -133,11 +133,11 @@ impl OneWayCounter {
|
||||||
let base = self.mapping.as_mut_ptr() as *mut u32;
|
let base = self.mapping.as_mut_ptr() as *mut u32;
|
||||||
|
|
||||||
if offset < ONEWAY_LEN {
|
if offset < ONEWAY_LEN {
|
||||||
let starting_value = self.get(offset).unwrap(); // offset is already checked
|
let starting_value = self.get(offset * COUNTER_STRIDE_U32).unwrap(); // offset is already checked
|
||||||
// this will cause the increment in hardware
|
// this will cause the increment in hardware
|
||||||
unsafe { base.add(offset).write_volatile(0) }
|
unsafe { base.add(offset * COUNTER_STRIDE_U32).write_volatile(0) }
|
||||||
crate::cache_flush();
|
crate::cache_flush();
|
||||||
let ending_value = self.get(offset).unwrap();
|
let ending_value = self.get(offset * COUNTER_STRIDE_U32).unwrap();
|
||||||
// if the increment didn't happen, we may have experienced wear-out on the line
|
// if the increment didn't happen, we may have experienced wear-out on the line
|
||||||
// it's only good for 10k increments
|
// it's only good for 10k increments
|
||||||
if ending_value != starting_value + 1 { Err(OneWayErr::IncFail) } else { Ok(()) }
|
if ending_value != starting_value + 1 { Err(OneWayErr::IncFail) } else { Ok(()) }
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue