Merge pull request #32 from luojia65/refactor/chip-rt

refactor(hal): move chip specific features from `hal` crate into `rt` crate

Author: luojia65

allwinner-hal/Cargo.toml

@@ -25,10 +25,3 @@ uart16550 = "0.0.1"
 plic = "0.0.2"
 embedded-sdmmc = "0.9.0"
 log = "0.4"
-
-[dev-dependencies]
-
-[features]
-default = ["d1"]
-# D1-like chips: D1-H, D1s, F133.
-d1 = []

allwinner-hal/src/ccu.rs

@@ -11,17 +11,6 @@ pub use pll::{PllCpuControl, PllDdrControl, PllPeri0Control};
 pub use register::*;
 pub use source::{CpuClockSource, DramClockSource, SmhcClockSource, SpiClockSource};
 
-use embedded_time::rate::Hertz;
-
-/// Clock configuration on current SoC.
-#[derive(Debug)]
-pub struct Clocks {
-    /// PSI clock frequency.
-    pub psi: Hertz,
-    /// Advanced Peripheral Bus 1 clock frequency.
-    pub apb1: Hertz,
-}
-
 /// Peripheral that have clock reset feature in CCU.
 pub trait ClockReset {
     /// Assert reset signal.

allwinner-hal/src/gpio/flex_pad.rs

@@ -0,0 +1,15 @@
+use core::marker::PhantomData;
+
+use super::Function;
+
+pub struct FlexPad<'a> {
+    _base: PhantomData<&'a super::RegisterBlock>,
+}
+
+impl<'a, const P: char, const N: u8, const F: u8> From<Function<'a, P, N, F>> for FlexPad<'a> {
+    #[inline]
+    fn from(value: Function<'a, P, N, F>) -> Self {
+        let _ = value;
+        FlexPad { _base: PhantomData }
+    }
+}

allwinner-hal/src/gpio.rs allwinner-hal/src/gpio/mod.rsallwinner-hal/src/gpio.rs renamed to allwinner-hal/src/gpio/mod.rs

@@ -1,5 +1,6 @@
 //! Allwinner GPIO controller.
 mod eint;
+mod flex_pad;
 mod function;
 mod input;
 mod mode;
@@ -8,6 +9,7 @@ mod pad_ext;
 mod register;
 
 pub use eint::{EintPad, Event};
+pub use flex_pad::FlexPad;
 pub use function::Function;
 pub use input::Input;
 pub use output::Output;

allwinner-hal/src/lib.rs

@@ -31,17 +31,3 @@ pub mod prelude {
     };
     pub use embedded_io::{Read as _, Write as _};
 }
-
-#[allow(unused)]
-macro_rules! impl_pins_trait {
-    ($(($p: expr_2021, $i: expr_2021, $f: expr_2021): $Trait: ty;)+) => {
-        $(
-impl<'a> $Trait for $crate::gpio::Function<'a, $p, $i, $f> {}
-        )+
-    };
-}
-
-/// SoC configurations on peripherals and interrupt contexts.
-pub mod wafer {
-    pub mod d1;
-}

allwinner-hal/src/smhc.rs

@@ -1,6 +1,7 @@
 //! SD/MMC Host Controller peripheral.
 
 mod register;
+use embedded_time::rate::Hertz;
 pub use register::*;
 mod pad;
 pub use pad::*;
@@ -32,3 +33,7 @@ pub enum SdCardError {
     Unknown,
     UnexpectedResponse(u8, u128),
 }
+
+pub trait Clock {
+    fn smhc_clock(&self) -> Hertz;
+}

allwinner-hal/src/smhc/pad.rs

@@ -1,10 +1,18 @@
+use crate::gpio::FlexPad;
+
 /// Clock signal pad.
-pub trait Clk {}
+pub trait IntoClk<'a> {
+    fn into_smhc_clk(self) -> FlexPad<'a>;
+}
 
 /// Command signal pad.
-pub trait Cmd {}
+pub trait IntoCmd<'a> {
+    fn into_smhc_cmd(self) -> FlexPad<'a>;
+}
 
 /// Data input and output pad.
 ///
 /// This is documented in the User Manual as `D[3:0]`.
-pub trait Data<const I: usize> {}
+pub trait IntoData<'a, const I: usize> {
+    fn into_smhc_data(self) -> FlexPad<'a>;
+}

allwinner-hal/src/smhc/structure.rs

@@ -4,7 +4,10 @@ use super::{
         AccessMode, BlockSize, BusWidth, CardType, Command, RegisterBlock, TransferDirection,
     },
 };
-use crate::ccu::{self, Clocks, SmhcClockSource};
+use crate::{
+    ccu::{self, SmhcClockSource},
+    smhc::Clock,
+};
 use core::arch::asm;
 use embedded_sdmmc::{Block, BlockDevice, BlockIdx};
 
@@ -181,12 +184,12 @@ impl<SMHC: AsRef<RegisterBlock>, PADS> Smhc<SMHC, PADS> {
     pub fn new<const SMHC_IDX: usize>(
         smhc: SMHC,
         pads: PADS,
-        clocks: &Clocks,
+        clock: impl Clock,
         ccu: &ccu::RegisterBlock,
     ) -> Self {
         let divider = 2;
         let (factor_n, factor_m) =
-            ccu::calculate_best_peripheral_factors_nm(clocks.psi.0, 20_000_000);
+            ccu::calculate_best_peripheral_factors_nm(clock.smhc_clock().0, 20_000_000);
         unsafe {
             smhc.as_ref()
                 .clock_control