From 1c6a5ecf73c8fa620e04f26b7dc49543be8ac1d1 Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Fri, 27 Jan 2023 06:46:44 -0800 Subject: [PATCH] Update the name of the `INTERRUPT` peripheral to `INTERRUPT_CORE0` --- esp-hal-common/Cargo.toml | 2 +- esp-hal-common/src/interrupt/xtensa.rs | 7 +------ esp-hal-common/src/peripherals/esp32s2.rs | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml index 9c785439334..1ea6873d1e0 100644 --- a/esp-hal-common/Cargo.toml +++ b/esp-hal-common/Cargo.toml @@ -55,7 +55,7 @@ ufmt-write = { version = "0.1.0", optional = true } esp32 = { version = "0.19.0", features = ["critical-section"], optional = true } esp32c2 = { version = "0.6.1", features = ["critical-section"], optional = true } esp32c3 = { version = "0.9.1", features = ["critical-section"], optional = true } -esp32s2 = { version = "0.9.0", features = ["critical-section"], optional = true } +esp32s2 = { version = "0.10.0", features = ["critical-section"], optional = true } esp32s3 = { version = "0.13.0", features = ["critical-section"], optional = true } [features] diff --git a/esp-hal-common/src/interrupt/xtensa.rs b/esp-hal-common/src/interrupt/xtensa.rs index 395f91dd0eb..ad821f288a3 100644 --- a/esp-hal-common/src/interrupt/xtensa.rs +++ b/esp-hal-common/src/interrupt/xtensa.rs @@ -165,12 +165,7 @@ unsafe fn core1_interrupt_peripheral() -> *const crate::peripherals::dport::Regi crate::peripherals::DPORT::PTR } -#[cfg(esp32s2)] -unsafe fn core0_interrupt_peripheral() -> *const crate::peripherals::interrupt::RegisterBlock { - crate::peripherals::INTERRUPT::PTR -} - -#[cfg(esp32s3)] +#[cfg(any(esp32s2, esp32s3))] unsafe fn core0_interrupt_peripheral() -> *const crate::peripherals::interrupt_core0::RegisterBlock { crate::peripherals::INTERRUPT_CORE0::PTR diff --git a/esp-hal-common/src/peripherals/esp32s2.rs b/esp-hal-common/src/peripherals/esp32s2.rs index 1110b20450d..10d4d421c75 100644 --- a/esp-hal-common/src/peripherals/esp32s2.rs +++ b/esp-hal-common/src/peripherals/esp32s2.rs @@ -18,7 +18,7 @@ crate::peripherals! { I2C0, I2C1, I2S, - INTERRUPT, + INTERRUPT_CORE0, IO_MUX, LEDC, PCNT,