alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2025-01-23 09:46:33 +11:00
Code Issues Projects Releases Packages Wiki Activity

Cargo fmt

Browse source
This commit is contained in:
Nic0w 2021-05-01 23:19:08 +02:00 • committed by 9names
parent ef7f8fe9b7
commit 4220b45c24
2 changed files with 28 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rp2040-hal/src/clocks/macros.rs
View file

@ -2,7 +2,6 @@
macro_rules! int_division { macro_rules! int_division {
($name:ident, $div:ident, $u:ty) => { ($name:ident, $div:ident, $u:ty) => {
impl IntegerDivision for $name { impl IntegerDivision for $name {
fn set_int_div(&mut self, div: usize) { fn set_int_div(&mut self, div: usize) {
unsafe { self.shared_dev.get() }.$div.write(|w| unsafe { unsafe { self.shared_dev.get() }.$div.write(|w| unsafe {
@ -14,10 +13,8 @@ macro_rules! int_division {
}; };
} }
macro_rules! frac_division { macro_rules! frac_division {
($name:ident, $div:ident, $u:ty) => { ($name:ident, $div:ident, $u:ty) => {
impl FractionDivision for $name { impl FractionDivision for $name {
fn set_frac_div(&mut self, div: usize) { fn set_frac_div(&mut self, div: usize) {
unsafe { self.shared_dev.get() }.$div.write(|w| unsafe { unsafe { self.shared_dev.get() }.$div.write(|w| unsafe {
@ -29,7 +26,6 @@ macro_rules! frac_division {
}; };
} }
macro_rules! clock_generator { macro_rules! clock_generator {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl ClockGenerator for $name { impl ClockGenerator for $name {
@ -57,10 +53,8 @@ macro_rules! clock_generator {
}; };
} }
macro_rules! xosc_source { macro_rules! xosc_source {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl XOSCClockSource for $name { impl XOSCClockSource for $name {
fn set_xosc_src(&mut self) { fn set_xosc_src(&mut self) {
unsafe { self.shared_dev.get() }.$ctrl.write(|w| { unsafe { self.shared_dev.get() }.$ctrl.write(|w| {
@ -72,7 +66,6 @@ macro_rules! xosc_source {
}; };
} }
macro_rules! rosc_source { macro_rules! rosc_source {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl ROSCClockSource for $name { impl ROSCClockSource for $name {
@ -86,7 +79,6 @@ macro_rules! rosc_source {
}; };
} }
macro_rules! selfaux_source { macro_rules! selfaux_source {
($name:ident, $ctrl:ident, $self:ident) => { ($name:ident, $ctrl:ident, $self:ident) => {
impl SelfAuxClockSource for $name { impl SelfAuxClockSource for $name {
@ -100,7 +92,6 @@ macro_rules! selfaux_source {
}; };
} }
macro_rules! clockref_source { macro_rules! clockref_source {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl ClockREFClockSource for $name { impl ClockREFClockSource for $name {
@ -114,7 +105,6 @@ macro_rules! clockref_source {
}; };
} }
macro_rules! clocksys_auxsource { macro_rules! clocksys_auxsource {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl ClockSYSClockAuxSource for $name { impl ClockSYSClockAuxSource for $name {
@ -141,7 +131,6 @@ macro_rules! xosc_auxsource {
}; };
} }
macro_rules! rosc_auxsource { macro_rules! rosc_auxsource {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl ROSCClockAuxSource for $name { impl ROSCClockAuxSource for $name {
@ -155,7 +144,6 @@ macro_rules! rosc_auxsource {
}; };
} }
macro_rules! rosc_ph_auxsource { macro_rules! rosc_ph_auxsource {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl ROSCPHClockAuxSource for $name { impl ROSCPHClockAuxSource for $name {
@ -169,7 +157,6 @@ macro_rules! rosc_ph_auxsource {
}; };
} }
macro_rules! gpin0_auxsource { macro_rules! gpin0_auxsource {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl Gpin0ClockAuxSource for $name { impl Gpin0ClockAuxSource for $name {
@ -183,7 +170,6 @@ macro_rules! gpin0_auxsource {
}; };
} }
macro_rules! gpin1_auxsource { macro_rules! gpin1_auxsource {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl Gpin1ClockAuxSource for $name { impl Gpin1ClockAuxSource for $name {
@ -197,7 +183,6 @@ macro_rules! gpin1_auxsource {
}; };
} }
macro_rules! pll_usb_auxsource { macro_rules! pll_usb_auxsource {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl PLLUSBClockAuxSource for $name { impl PLLUSBClockAuxSource for $name {
@ -211,7 +196,6 @@ macro_rules! pll_usb_auxsource {
}; };
} }
macro_rules! pll_sys_auxsource { macro_rules! pll_sys_auxsource {
($name:ident, $ctrl:ident) => { ($name:ident, $ctrl:ident) => {
impl PLLSYSClockAuxSource for $name { impl PLLSYSClockAuxSource for $name {

37
rp2040-hal/src/clocks/mod.rs
View file

@ -9,14 +9,12 @@ mod macros;
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
/// Provides refs to the CLOCKS block. /// Provides refs to the CLOCKS block.
pub struct ShareableClocks { pub struct ShareableClocks {
_internal: () _internal: (),
} }
impl ShareableClocks { impl ShareableClocks {
fn new(_clocks: &mut CLOCKS) -> Self { fn new(_clocks: &mut CLOCKS) -> Self {
ShareableClocks { ShareableClocks { _internal: () }
_internal: ()
}
} }
unsafe fn get(&self) -> &clocks::RegisterBlock { unsafe fn get(&self) -> &clocks::RegisterBlock {
@ -27,16 +25,15 @@ impl ShareableClocks {
/// Abstraction layer providing Clock Management. /// Abstraction layer providing Clock Management.
pub struct ClocksManager { pub struct ClocksManager {
clocks: CLOCKS, clocks: CLOCKS,
shared_clocks: ShareableClocks shared_clocks: ShareableClocks,
} }
impl ClocksManager { impl ClocksManager {
/// Exchanges CLOCKS block against Self. /// Exchanges CLOCKS block against Self.
pub fn new(mut clocks_block: CLOCKS) -> Self { pub fn new(mut clocks_block: CLOCKS) -> Self {
let shared_clocks = ShareableClocks::new(&mut clocks_block); let shared_clocks = ShareableClocks::new(&mut clocks_block);
ClocksManager { ClocksManager {
clocks: clocks_block, clocks: clocks_block,
shared_clocks: shared_clocks shared_clocks: shared_clocks,
} }
} }
@ -55,22 +52,20 @@ impl ClocksManager {
/// Getter for the System Clock /// Getter for the System Clock
pub fn sys_clock(&self) -> SystemClock { pub fn sys_clock(&self) -> SystemClock {
SystemClock { SystemClock {
shared_dev: self.shared_clocks.clone() shared_dev: self.shared_clocks.clone(),
} }
} }
/// Getter for the PeripheralClock /// Getter for the PeripheralClock
pub fn peripheral_clock(&self) -> PeripheralClock { pub fn peripheral_clock(&self) -> PeripheralClock {
PeripheralClock { PeripheralClock {
shared_dev: self.shared_clocks.clone() shared_dev: self.shared_clocks.clone(),
} }
} }
} }
/// For clocks with an integer divider. /// For clocks with an integer divider.
pub trait IntegerDivision { pub trait IntegerDivision {
/// Set integer divider value. /// Set integer divider value.
fn set_int_div(&mut self, div: usize); fn set_int_div(&mut self, div: usize);
} }
@ -88,75 +83,62 @@ pub trait XOSCClockSource {
} }
/// For clocks that can have ROSC as source. /// For clocks that can have ROSC as source.
pub trait ROSCClockSource { pub trait ROSCClockSource {
/// set ROSC as a source. /// set ROSC as a source.
fn set_rosc_src(&mut self); fn set_rosc_src(&mut self);
} }
/// For clocks that can have ... itself (?) as a source (is that the "glitchless mux" ?) /// For clocks that can have ... itself (?) as a source (is that the "glitchless mux" ?)
pub trait SelfAuxClockSource { pub trait SelfAuxClockSource {
/// Set ... /// Set ...
fn set_self_aux_src(&mut self); fn set_self_aux_src(&mut self);
} }
/// For clocks that can have the Reference Clock as source. /// For clocks that can have the Reference Clock as source.
pub trait ClockREFClockSource { pub trait ClockREFClockSource {
/// Set Reference Clock as /// Set Reference Clock as
fn set_clkref_src(&mut self); fn set_clkref_src(&mut self);
} }
/// For clocks that can have the System Clock as an auxilliary source. /// For clocks that can have the System Clock as an auxilliary source.
pub trait ClockSYSClockAuxSource { pub trait ClockSYSClockAuxSource {
/// Set System Clock as source. /// Set System Clock as source.
fn set_clksys_auxsrc(&mut self); fn set_clksys_auxsrc(&mut self);
} }
/// For clocks that can have XOSC as an auxilliary source. /// For clocks that can have XOSC as an auxilliary source.
pub trait XOSCClockAuxSource { pub trait XOSCClockAuxSource {
/// Set XOSC as auxilliary source. /// Set XOSC as auxilliary source.
fn set_xosc_auxsrc(&mut self); fn set_xosc_auxsrc(&mut self);
} }
/// For clocks that can have ROSC as an auxilliary source. /// For clocks that can have ROSC as an auxilliary source.
pub trait ROSCClockAuxSource { pub trait ROSCClockAuxSource {
/// Set ROSC as auxilliary source. /// Set ROSC as auxilliary source.
fn set_rosc_auxsrc(&mut self); fn set_rosc_auxsrc(&mut self);
} }
/// For clocks that can have ROSC_PH as an auxilliary source. /// For clocks that can have ROSC_PH as an auxilliary source.
pub trait ROSCPHClockAuxSource { pub trait ROSCPHClockAuxSource {
/// Set ROSC_PH as auxilliary source. /// Set ROSC_PH as auxilliary source.
fn set_rosc_ph_auxsrc(&mut self); fn set_rosc_ph_auxsrc(&mut self);
} }
/// For clocks that can have PLL_USB as an auxilliary source. /// For clocks that can have PLL_USB as an auxilliary source.
pub trait PLLUSBClockAuxSource { pub trait PLLUSBClockAuxSource {
/// Set PLL_USB as auxilliary source. /// Set PLL_USB as auxilliary source.
fn set_pll_usb_auxsrc(&mut self); fn set_pll_usb_auxsrc(&mut self);
} }
/// For clocks that can have PLL_SYS as an auxilliary source. /// For clocks that can have PLL_SYS as an auxilliary source.
pub trait PLLSYSClockAuxSource { pub trait PLLSYSClockAuxSource {
/// Set PLL_SYS as auxilliary source. /// Set PLL_SYS as auxilliary source.
fn set_pll_sys_auxsrc(&mut self); fn set_pll_sys_auxsrc(&mut self);
} }
/// For clocks that can have gpin0 as an auxilliary source. /// For clocks that can have gpin0 as an auxilliary source.
pub trait Gpin0ClockAuxSource { pub trait Gpin0ClockAuxSource {
/// Set clock to be received from gpin0 (auxilliary) /// Set clock to be received from gpin0 (auxilliary)
fn set_gpin0_auxsrc(&mut self); fn set_gpin0_auxsrc(&mut self);
} }
/// For clocks that can have gpin1 as an auxilliary source. /// For clocks that can have gpin1 as an auxilliary source.
pub trait Gpin1ClockAuxSource { pub trait Gpin1ClockAuxSource {
/// Set clock to be received from gpin1 /// Set clock to be received from gpin1
fn set_gpin1_auxsrc(&mut self); fn set_gpin1_auxsrc(&mut self);
} }
/// For clocks having a generator. /// For clocks having a generator.
pub trait ClockGenerator { pub trait ClockGenerator {
/// Enables the clock. /// Enables the clock.
fn enable(&mut self); fn enable(&mut self);
@ -181,13 +163,11 @@ int_division!(ReferenceClock, clk_ref_div, u8);
/// System Clock /// System Clock
pub struct SystemClock { pub struct SystemClock {
shared_dev: ShareableClocks shared_dev: ShareableClocks,
} }
impl SystemClock { impl SystemClock {
/// WIP - Helper function to reset source (blocking) /// WIP - Helper function to reset source (blocking)
pub fn reset_source_await(&self) { pub fn reset_source_await(&self) {
let shared_dev = unsafe { self.shared_dev.get() }; let shared_dev = unsafe { self.shared_dev.get() };
shared_dev.clk_sys_ctrl.write(|w| { shared_dev.clk_sys_ctrl.write(|w| {
@ -219,10 +199,9 @@ rosc_auxsource!(SystemClock, clk_sys_ctrl);
int_division!(SystemClock, clk_sys_div, u32); int_division!(SystemClock, clk_sys_div, u32);
frac_division!(SystemClock, clk_sys_div, u8); frac_division!(SystemClock, clk_sys_div, u8);
/// Peripheral Clock /// Peripheral Clock
pub struct PeripheralClock { pub struct PeripheralClock {
shared_dev: ShareableClocks shared_dev: ShareableClocks,
} }
gpin0_auxsource!(PeripheralClock, clk_peri_ctrl); gpin0_auxsource!(PeripheralClock, clk_peri_ctrl);
gpin1_auxsource!(PeripheralClock, clk_peri_ctrl); gpin1_auxsource!(PeripheralClock, clk_peri_ctrl);