mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
fix Atomic version of instructions to be non-mut
better compatibility with usb libraries
This commit is contained in:
parent
709c087337
commit
22c9867a9a
1 changed files with 10 additions and 10 deletions
|
|
@ -656,29 +656,29 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// Read the contents of this register
|
/// Read the contents of this register
|
||||||
pub fn r(&mut self, reg: Register) -> T {
|
pub fn r(&self, reg: Register) -> T {
|
||||||
// prevent re-ordering
|
// prevent re-ordering
|
||||||
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
||||||
|
|
||||||
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.get_mut()) };
|
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.load(core::sync::atomic::Ordering::SeqCst)) };
|
||||||
unsafe { usize_base.add(reg.offset).read_volatile() }
|
unsafe { usize_base.add(reg.offset).read_volatile() }
|
||||||
.try_into()
|
.try_into()
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
}
|
}
|
||||||
/// Read a field from this CSR
|
/// Read a field from this CSR
|
||||||
pub fn rf(&mut self, field: Field) -> T {
|
pub fn rf(&self, field: Field) -> T {
|
||||||
// prevent re-ordering
|
// prevent re-ordering
|
||||||
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
||||||
|
|
||||||
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.get_mut()) };
|
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.load(core::sync::atomic::Ordering::SeqCst)) };
|
||||||
((unsafe { usize_base.add(field.register.offset).read_volatile() } >> field.offset)
|
((unsafe { usize_base.add(field.register.offset).read_volatile() } >> field.offset)
|
||||||
& field.mask)
|
& field.mask)
|
||||||
.try_into()
|
.try_into()
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
}
|
}
|
||||||
/// Read-modify-write a given field in this CSR
|
/// Read-modify-write a given field in this CSR
|
||||||
pub fn rmwf(&mut self, field: Field, value: T) {
|
pub fn rmwf(&self, field: Field, value: T) {
|
||||||
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.get_mut()) };
|
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.load(core::sync::atomic::Ordering::SeqCst)) };
|
||||||
let value_as_usize: usize = value.try_into().unwrap_or_default() << field.offset;
|
let value_as_usize: usize = value.try_into().unwrap_or_default() << field.offset;
|
||||||
let previous =
|
let previous =
|
||||||
unsafe { usize_base.add(field.register.offset).read_volatile() } & !(field.mask << field.offset);
|
unsafe { usize_base.add(field.register.offset).read_volatile() } & !(field.mask << field.offset);
|
||||||
|
|
@ -691,8 +691,8 @@ where
|
||||||
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
||||||
}
|
}
|
||||||
/// Write a given field without reading it first
|
/// Write a given field without reading it first
|
||||||
pub fn wfo(&mut self, field: Field, value: T) {
|
pub fn wfo(&self, field: Field, value: T) {
|
||||||
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.get_mut()) };
|
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.load(core::sync::atomic::Ordering::SeqCst)) };
|
||||||
let value_as_usize: usize = (value.try_into().unwrap_or_default() & field.mask) << field.offset;
|
let value_as_usize: usize = (value.try_into().unwrap_or_default() & field.mask) << field.offset;
|
||||||
unsafe {
|
unsafe {
|
||||||
usize_base
|
usize_base
|
||||||
|
|
@ -705,8 +705,8 @@ where
|
||||||
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
||||||
}
|
}
|
||||||
/// Write the entire contents of a register without reading it first
|
/// Write the entire contents of a register without reading it first
|
||||||
pub fn wo(&mut self, reg: Register, value: T) {
|
pub fn wo(&self, reg: Register, value: T) {
|
||||||
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.get_mut()) };
|
let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.load(core::sync::atomic::Ordering::SeqCst)) };
|
||||||
let value_as_usize: usize = value.try_into().unwrap_or_default();
|
let value_as_usize: usize = value.try_into().unwrap_or_default();
|
||||||
unsafe { usize_base.add(reg.offset).write_volatile(value_as_usize) };
|
unsafe { usize_base.add(reg.offset).write_volatile(value_as_usize) };
|
||||||
// Ensure the compiler doesn't re-order the write.
|
// Ensure the compiler doesn't re-order the write.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue