itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-10-02 14:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant Enable trait (#2523)

Browse Source 
Co-authored-by: Dominic Fischer <git@dominicfischer.me>
This commit is contained in:
Dominic Fischer 2024-11-13 08:26:18 +00:00 committed by GitHub
parent 0b452f7933
commit 456bcfb7c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
esp-hal/src/timer/timg.rs
View File

@ -81,7 +81,7 @@ use crate::{
peripherals::{timg0::RegisterBlock, Interrupt, TIMG0}, peripherals::{timg0::RegisterBlock, Interrupt, TIMG0},
private::Sealed, private::Sealed,
sync::{lock, Lock}, sync::{lock, Lock},
system::{Peripheral as PeripheralEnable, PeripheralClockControl}, system::PeripheralClockControl,
Async, Async,
Blocking, Blocking,
InterruptConfigurable, InterruptConfigurable,
@ -152,7 +152,7 @@ impl TimerGroupInstance for TIMG0 {
} }
fn enable_peripheral() { fn enable_peripheral() {
crate::system::PeripheralClockControl::enable(crate::system::Peripheral::Timg0) PeripheralClockControl::enable(crate::system::Peripheral::Timg0)
} }
fn reset_peripheral() { fn reset_peripheral() {
@ -215,11 +215,11 @@ impl TimerGroupInstance for crate::peripherals::TIMG1 {
} }
fn enable_peripheral() { fn enable_peripheral() {
crate::system::PeripheralClockControl::enable(crate::system::Peripheral::Timg1) PeripheralClockControl::enable(crate::system::Peripheral::Timg1)
} }
fn reset_peripheral() { fn reset_peripheral() {
crate::system::PeripheralClockControl::reset(crate::system::Peripheral::Timg1) PeripheralClockControl::reset(crate::system::Peripheral::Timg1)
} }
fn configure_wdt_src_clk() { fn configure_wdt_src_clk() {
@ -377,7 +377,6 @@ where
{ {
/// Construct a new instance of [`Timer`] /// Construct a new instance of [`Timer`]
pub fn new(timg: T, apb_clk_freq: HertzU32) -> Self { pub fn new(timg: T, apb_clk_freq: HertzU32) -> Self {
timg.enable_peripheral();
timg.set_counter_active(true); timg.set_counter_active(true);
Self { Self {
@ -599,7 +598,7 @@ where
} }
#[doc(hidden)] #[doc(hidden)]
pub trait Instance: Sealed + Enable { pub trait Instance: Sealed {
fn register_block(&self) -> &RegisterBlock; fn register_block(&self) -> &RegisterBlock;
fn timer_group(&self) -> u8; fn timer_group(&self) -> u8;
@ -637,11 +636,6 @@ pub trait Instance: Sealed + Enable {
fn is_interrupt_set(&self) -> bool; fn is_interrupt_set(&self) -> bool;
} }
#[doc(hidden)]
pub trait Enable: Sealed {
fn enable_peripheral(&self);
}
/// A timer within a Timer Group. /// A timer within a Timer Group.
pub struct TimerX<TG, const T: u8 = 0> { pub struct TimerX<TG, const T: u8 = 0> {
phantom: PhantomData<TG>, phantom: PhantomData<TG>,
@ -674,7 +668,6 @@ where
impl<TG, const T: u8> Instance for TimerX<TG, T> impl<TG, const T: u8> Instance for TimerX<TG, T>
where where
TG: TimerGroupInstance, TG: TimerGroupInstance,
Self: Enable,
{ {
fn register_block(&self) -> &RegisterBlock { fn register_block(&self) -> &RegisterBlock {
unsafe { &*TG::register_block() } unsafe { &*TG::register_block() }
@ -815,25 +808,6 @@ pub type Timer0<TG> = TimerX<TG, 0>;
#[cfg(timg_timer1)] #[cfg(timg_timer1)]
pub type Timer1<TG> = TimerX<TG, 1>; pub type Timer1<TG> = TimerX<TG, 1>;
impl<TG> Enable for Timer0<TG>
where
TG: TimerGroupInstance,
{
fn enable_peripheral(&self) {
PeripheralClockControl::enable(PeripheralEnable::Timg0);
}
}
#[cfg(timg_timer1)]
impl<TG> Enable for Timer1<TG>
where
TG: TimerGroupInstance,
{
fn enable_peripheral(&self) {
PeripheralClockControl::enable(PeripheralEnable::Timg1);
}
}
fn ticks_to_timeout<F>(ticks: u64, clock: F, divider: u32) -> u64 fn ticks_to_timeout<F>(ticks: u64, clock: F, divider: u32) -> u64
where where
F: Into<HertzU32>, F: Into<HertzU32>,
@ -956,7 +930,7 @@ where
/// Construct a new instance of [`Wdt`] /// Construct a new instance of [`Wdt`]
pub fn new() -> Self { pub fn new() -> Self {
#[cfg(lp_wdt)] #[cfg(lp_wdt)]
PeripheralClockControl::enable(PeripheralEnable::Wdt); PeripheralClockControl::enable(crate::system::Peripheral::Wdt);
TG::configure_wdt_src_clk(); TG::configure_wdt_src_clk();