Skip to content
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

Update the name of the INTERRUPT peripheral to INTERRUPT_CORE0 #364

Merged
merged 1 commit into from
Jan 27, 2023
Merged

Update the name of the INTERRUPT peripheral to INTERRUPT_CORE0 #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion esp-hal-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
7 changes: 1 addition & 6 deletions esp-hal-common/src/interrupt/xtensa.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion esp-hal-common/src/peripherals/esp32s2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ crate::peripherals! {
I2C0,
I2C1,
I2S,
INTERRUPT,
INTERRUPT_CORE0,
IO_MUX,
LEDC,
PCNT,
Expand Down