Skip to content

No longer publicly expose the PeripheralClockControl struct #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jessebraham merged 6 commits into from
Sep 26, 2023
Merged

No longer publicly expose the PeripheralClockControl struct #817

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
61e9aff
No longer publicly expose the `PeripheralClockControl` struct
jessebraham Sep 25, 2023
6c55f27
Update examples as needed to get things building again
jessebraham Sep 25, 2023
b27a45d
Update CHANGELOG.md
jessebraham Sep 25, 2023
3145d1e
Address review feedback, fix a warning
jessebraham Sep 25, 2023
3202619
Use a critical section for all devices other than the ESP32-C6/H2, as…
jessebraham Sep 26, 2023
6c28784
Rebase and update `etm` driver to fix build errors
jessebraham Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Rebase and update etm driver to fix build errors
  • Loading branch information
@jessebraham
jessebraham committed Sep 26, 2023
commit 6c287843f0ecb36fdcd31d74a2be068896802d54
10 changes: 4 additions & 6 deletions esp-hal-common/src/etm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
//! let led_task = gpio_ext.channel0_task.toggle(&mut led);
//! let button_event = gpio_ext.channel0_event.falling_edge(button);
//!
//! let etm = Etm::new(peripherals.SOC_ETM, &mut system.peripheral_clock_control);
//! let etm = Etm::new(peripherals.SOC_ETM);
//! let channel0 = etm.channel0;
//!
//! // make sure the configured channel doesn't get dropped - dropping it will
Expand Down Expand Up @@ -241,12 +241,10 @@ macro_rules! create_etm_constructor {
($($num:literal),+) => {
paste::paste! {
impl<'d> Etm<'d> {
pub fn new(
peripheral: impl Peripheral<P = crate::peripherals::SOC_ETM> + 'd,
peripheral_clock_control: &mut PeripheralClockControl,
) -> Self {
pub fn new(peripheral: impl Peripheral<P = crate::peripherals::SOC_ETM> + 'd) -> Self {
crate::into_ref!(peripheral);
peripheral_clock_control.enable(crate::system::Peripheral::Etm);

PeripheralClockControl::enable(crate::system::Peripheral::Etm);

Self {
_peripheral: peripheral,
Expand Down
4 changes: 2 additions & 2 deletions esp32c6-hal/examples/etm_gpio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use esp_backtrace as _;
fn main() -> ! {
esp_println::logger::init_logger_from_env();
let peripherals = Peripherals::take();
let mut system = peripherals.PCR.split();
let system = peripherals.PCR.split();
let _clocks = ClockControl::boot_defaults(system.clock_control).freeze();

let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
Expand All @@ -30,7 +30,7 @@ fn main() -> ! {
let led_task = gpio_ext.channel0_task.toggle(&mut led);
let button_event = gpio_ext.channel0_event.falling_edge(button);

let etm = Etm::new(peripherals.SOC_ETM, &mut system.peripheral_clock_control);
let etm = Etm::new(peripherals.SOC_ETM);
let channel0 = etm.channel0;

// make sure the configured channel doesn't get dropped - dropping it will
Expand Down
4 changes: 2 additions & 2 deletions esp32h2-hal/examples/etm_gpio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use esp_backtrace as _;
fn main() -> ! {
esp_println::logger::init_logger_from_env();
let peripherals = Peripherals::take();
let mut system = peripherals.PCR.split();
let system = peripherals.PCR.split();
let _clocks = ClockControl::boot_defaults(system.clock_control).freeze();

let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
Expand All @@ -30,7 +30,7 @@ fn main() -> ! {
let led_task = gpio_ext.channel0_task.toggle(&mut led);
let button_event = gpio_ext.channel0_event.falling_edge(button);

let etm = Etm::new(peripherals.SOC_ETM, &mut system.peripheral_clock_control);
let etm = Etm::new(peripherals.SOC_ETM);
let channel0 = etm.channel0;

// make sure the configured channel doesn't get dropped - dropping it will
Expand Down