refactor: format code and remove dependency onmemoffset (#19)

* style: format code and adjust indentation

Signed-off-by: Longbing Zheng <1211998648@qq.com>

* build(deps): remove dependency on memoffset

Signed-off-by: Longbing Zheng <1211998648@qq.com>

---------

Signed-off-by: Longbing Zheng <1211998648@qq.com>

Author: luojia65

allwinner-hal/Cargo.toml

@@ -26,7 +26,6 @@ plic = "0.0.2"
 embedded-sdmmc = "0.8.1"
 
 [dev-dependencies]
-memoffset = "0.8"
 
 [features]
 default = ["d1"]

allwinner-hal/src/ccu.rs

@@ -812,7 +812,7 @@ mod tests {
         AxiFactorN, CpuAxiConfig, CpuClockSource, DramBusGating, DramClock, DramClockSource,
         FactorP, MbusClock, PeriFactorN, RegisterBlock,
     };
-    use memoffset::offset_of;
+    use core::mem::offset_of;
     #[test]
     fn offset_ccu() {
         assert_eq!(offset_of!(RegisterBlock, pll_cpu_control), 0x0);

allwinner-hal/src/com.rs

@@ -102,7 +102,7 @@ impl RegisterBlock {
 #[cfg(test)]
 mod tests {
     use super::RegisterBlock;
-    use memoffset::offset_of;
+    use core::mem::offset_of;
     #[test]
     fn offset_com() {
         assert_eq!(offset_of!(RegisterBlock, tmr), 0x0c);

allwinner-hal/src/gpio/register.rs

@@ -55,7 +55,7 @@ pub struct PioPow {
 #[cfg(test)]
 mod tests {
     use super::{Eint, PioPow, Port, RegisterBlock};
-    use memoffset::offset_of;
+    use core::mem::offset_of;
 
     #[test]
     fn offset_gpio() {

allwinner-hal/src/phy.rs

@@ -129,7 +129,7 @@ impl RegisterBlock {
 #[cfg(test)]
 mod tests {
     use super::{Datx8, RegisterBlock};
-    use memoffset::offset_of;
+    use core::mem::offset_of;
     #[test]
     fn offset_phy() {
         assert_eq!(offset_of!(RegisterBlock, lp3mr11), 0x2c);

allwinner-hal/src/smhc/register.rs

@@ -1054,7 +1054,7 @@ mod tests {
         Interrupt, InterruptMask, InterruptStateMasked, InterruptStateRaw, NewTimingSet,
         NtsTimingPhase, RegisterBlock, Status, TimeOut, TransferDirection,
     };
-    use memoffset::offset_of;
+    use core::mem::offset_of;
     #[test]
     fn offset_smhc() {
         assert_eq!(offset_of!(RegisterBlock, global_control), 0x0);

allwinner-hal/src/spi.rs

@@ -479,7 +479,7 @@ impl<SPI: AsRef<RegisterBlock>, const I: usize, PINS: Pins<I>> embedded_hal::spi
 #[cfg(test)]
 mod tests {
     use super::RegisterBlock;
-    use memoffset::offset_of;
+    use core::mem::offset_of;
     #[test]
     fn offset_spi0() {
         assert_eq!(offset_of!(RegisterBlock, ier), 0x10);

allwinner-hal/src/uart.rs

@@ -380,7 +380,7 @@ impl UartStatus {
 #[cfg(test)]
 mod tests {
     use super::RegisterBlock;
-    use memoffset::offset_of;
+    use core::mem::offset_of;
     #[test]
     fn offset_uart() {
         assert_eq!(offset_of!(RegisterBlock, usr), 0x7c);

allwinner-rt/src/macros.rs

@@ -1,26 +1,35 @@
 macro_rules! soc {
-    ($($(#[$doc:meta])* pub struct $Ty: ident => $paddr: expr_2021$(, $DerefTy: ty)+;)+) => {
+    (
         $(
-$(#[$doc])*
-#[allow(non_camel_case_types)]
-pub struct $Ty {
-    _private: (),
-}
-$(
-impl core::ops::Deref for $Ty {
-    type Target = $DerefTy;
-    #[inline(always)]
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*($paddr as *const _) }
-    }
-}
-impl core::convert::AsRef<$DerefTy> for $Ty {
-    #[inline(always)]
-    fn as_ref(&self) -> &$DerefTy {
-        unsafe { &*($paddr as *const _) }
-    }
-}
-)+
+            $(#[$doc:meta])*
+            pub struct $Ty:ident => $paddr:expr_2021
+            $(, $DerefTy:ty)+ ;
+        )+
+    ) => {
+        $(
+            $(#[$doc])*
+            #[allow(non_camel_case_types)]
+            pub struct $Ty {
+                _private: (),
+            }
+
+            $(
+                impl core::ops::Deref for $Ty {
+                    type Target = $DerefTy;
+
+                    #[inline(always)]
+                    fn deref(&self) -> &Self::Target {
+                        unsafe { &*($paddr as *const _) }
+                    }
+                }
+
+                impl core::convert::AsRef<$DerefTy> for $Ty {
+                    #[inline(always)]
+                    fn as_ref(&self) -> &$DerefTy {
+                        unsafe { &*($paddr as *const _) }
+                    }
+                }
+            )+
         )+
     };
 }