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

Rename TIMGx interrupts for ESP32-P4 #280

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Rename TIMGx interrupts for ESP32-P4 #280

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
12 changes: 6 additions & 6 deletions esp32p4/device.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ PROVIDE(TWAI2 = DefaultHandler);
PROVIDE(RMT = DefaultHandler);
PROVIDE(I2C0 = DefaultHandler);
PROVIDE(I2C1 = DefaultHandler);
PROVIDE(TG0_T0 = DefaultHandler);
PROVIDE(TG0_T1 = DefaultHandler);
PROVIDE(TG0_WDT = DefaultHandler);
PROVIDE(TG1_T0 = DefaultHandler);
PROVIDE(TG1_T1 = DefaultHandler);
PROVIDE(TG1_WDT = DefaultHandler);
PROVIDE(TG0_T0_LEVEL = DefaultHandler);
PROVIDE(TG0_T1_LEVEL = DefaultHandler);
PROVIDE(TG0_WDT_LEVEL = DefaultHandler);
PROVIDE(TG1_T0_LEVEL = DefaultHandler);
PROVIDE(TG1_T1_LEVEL = DefaultHandler);
PROVIDE(TG1_WDT_LEVEL = DefaultHandler);
PROVIDE(LEDC = DefaultHandler);
PROVIDE(SYSTIMER_TARGET0 = DefaultHandler);
PROVIDE(SYSTIMER_TARGET1 = DefaultHandler);
Expand Down
36 changes: 18 additions & 18 deletions esp32p4/src/interrupt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,18 @@ pub enum Interrupt {
I2C0 = 44,
#[doc = "45 - I2C1"]
I2C1 = 45,
#[doc = "46 - TG0_T0"]
TG0_T0 = 46,
#[doc = "47 - TG0_T1"]
TG0_T1 = 47,
#[doc = "48 - TG0_WDT"]
TG0_WDT = 48,
#[doc = "49 - TG1_T0"]
TG1_T0 = 49,
#[doc = "50 - TG1_T1"]
TG1_T1 = 50,
#[doc = "51 - TG1_WDT"]
TG1_WDT = 51,
#[doc = "46 - TG0_T0_LEVEL"]
TG0_T0_LEVEL = 46,
#[doc = "47 - TG0_T1_LEVEL"]
TG0_T1_LEVEL = 47,
#[doc = "48 - TG0_WDT_LEVEL"]
TG0_WDT_LEVEL = 48,
#[doc = "49 - TG1_T0_LEVEL"]
TG1_T0_LEVEL = 49,
#[doc = "50 - TG1_T1_LEVEL"]
TG1_T1_LEVEL = 50,
#[doc = "51 - TG1_WDT_LEVEL"]
TG1_WDT_LEVEL = 51,
#[doc = "52 - LEDC"]
LEDC = 52,
#[doc = "53 - SYSTIMER_TARGET0"]
Expand Down Expand Up @@ -246,12 +246,12 @@ impl Interrupt {
43 => Ok(Interrupt::RMT),
44 => Ok(Interrupt::I2C0),
45 => Ok(Interrupt::I2C1),
46 => Ok(Interrupt::TG0_T0),
47 => Ok(Interrupt::TG0_T1),
48 => Ok(Interrupt::TG0_WDT),
49 => Ok(Interrupt::TG1_T0),
50 => Ok(Interrupt::TG1_T1),
51 => Ok(Interrupt::TG1_WDT),
46 => Ok(Interrupt::TG0_T0_LEVEL),
47 => Ok(Interrupt::TG0_T1_LEVEL),
48 => Ok(Interrupt::TG0_WDT_LEVEL),
49 => Ok(Interrupt::TG1_T0_LEVEL),
50 => Ok(Interrupt::TG1_T1_LEVEL),
51 => Ok(Interrupt::TG1_WDT_LEVEL),
52 => Ok(Interrupt::LEDC),
53 => Ok(Interrupt::SYSTIMER_TARGET0),
54 => Ok(Interrupt::SYSTIMER_TARGET1),
Expand Down
36 changes: 24 additions & 12 deletions esp32p4/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ extern "C" {
fn RMT();
fn I2C0();
fn I2C1();
fn TG0_T0();
fn TG0_T1();
fn TG0_WDT();
fn TG1_T0();
fn TG1_T1();
fn TG1_WDT();
fn TG0_T0_LEVEL();
fn TG0_T1_LEVEL();
fn TG0_WDT_LEVEL();
fn TG1_T0_LEVEL();
fn TG1_T1_LEVEL();
fn TG1_WDT_LEVEL();
fn LEDC();
fn SYSTIMER_TARGET0();
fn SYSTIMER_TARGET1();
Expand Down Expand Up @@ -176,12 +176,24 @@ pub static __EXTERNAL_INTERRUPTS: [Vector; 128] = [
Vector { _handler: RMT },
Vector { _handler: I2C0 },
Vector { _handler: I2C1 },
Vector { _handler: TG0_T0 },
Vector { _handler: TG0_T1 },
Vector { _handler: TG0_WDT },
Vector { _handler: TG1_T0 },
Vector { _handler: TG1_T1 },
Vector { _handler: TG1_WDT },
Vector {
_handler: TG0_T0_LEVEL,
},
Vector {
_handler: TG0_T1_LEVEL,
},
Vector {
_handler: TG0_WDT_LEVEL,
},
Vector {
_handler: TG1_T0_LEVEL,
},
Vector {
_handler: TG1_T1_LEVEL,
},
Vector {
_handler: TG1_WDT_LEVEL,
},
Vector { _handler: LEDC },
Vector {
_handler: SYSTIMER_TARGET0,
Expand Down
18 changes: 18 additions & 0 deletions esp32p4/svd/patches/esp32p4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,24 @@ UHCI0:

TIMG0:
_include: ../../../common_patches/tim_expand_and_collect.yaml
_modify:
_interrupts:
TG0_T0:
name: TG0_T0_LEVEL
TG0_T1:
name: TG0_T1_LEVEL
TG0_WDT:
name: TG0_WDT_LEVEL

TIMG1:
_modify:
_interrupts:
TG1_T0:
name: TG1_T0_LEVEL
TG1_T1:
name: TG1_T1_LEVEL
TG1_WDT:
name: TG1_WDT_LEVEL

SPI1:
_include: ../../../common_patches/spi_w.yaml
Expand Down