From 22c9867a9a3da793f899252ee60a27ca3ca3be39 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 6 May 2022 13:36:11 +0800 Subject: [PATCH] fix Atomic version of instructions to be non-mut better compatibility with usb libraries --- svd2utra/src/generate.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index 387f86f23..c1543f42d 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -656,29 +656,29 @@ where } } /// Read the contents of this register - pub fn r(&mut self, reg: Register) -> T { + pub fn r(&self, reg: Register) -> T { // prevent re-ordering 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() } .try_into() .unwrap_or_default() } /// Read a field from this CSR - pub fn rf(&mut self, field: Field) -> T { + pub fn rf(&self, field: Field) -> T { // prevent re-ordering 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) & field.mask) .try_into() .unwrap_or_default() } /// Read-modify-write a given field in this CSR - pub fn rmwf(&mut self, field: Field, value: T) { - let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.get_mut()) }; + pub fn rmwf(&self, field: Field, value: T) { + 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 previous = 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); } /// Write a given field without reading it first - pub fn wfo(&mut self, field: Field, value: T) { - let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.get_mut()) }; + pub fn wfo(&self, field: Field, value: T) { + 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; unsafe { usize_base @@ -705,8 +705,8 @@ where core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst); } /// Write the entire contents of a register without reading it first - pub fn wo(&mut self, reg: Register, value: T) { - let usize_base: *mut usize = unsafe { core::mem::transmute(self.base.get_mut()) }; + pub fn wo(&self, reg: Register, value: T) { + 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(); unsafe { usize_base.add(reg.offset).write_volatile(value_as_usize) }; // Ensure the compiler doesn't re-order the write.