diff --git a/esp-hal/CHANGELOG.md b/esp-hal/CHANGELOG.md index 1af35f6ff..4b6c13a1e 100644 --- a/esp-hal/CHANGELOG.md +++ b/esp-hal/CHANGELOG.md @@ -69,6 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `AesDma::{write_key, write_block}` have been removed. (#3880, #3882) - `AesFlavour` trait and `AesX` structs have been removed. (#3880) - `Xtal::Other` has been removed (#3983) +- ESP32-C3/S3: removed the UHCI1 peripheral singleton (#4007) ## [v1.0.0-rc.0] - 2025-07-16 diff --git a/esp-hal/Cargo.toml b/esp-hal/Cargo.toml index 77ab44e67..14b4508f9 100644 --- a/esp-hal/Cargo.toml +++ b/esp-hal/Cargo.toml @@ -73,13 +73,13 @@ ufmt-write = { version = "0.1.0", optional = true } # IMPORTANT: # Each supported device MUST have its PAC included below along with a # corresponding feature. -esp32 = { version = "0.38.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "abbd5169c3bcd926c0f3b5078a81c8d2d3849a42" } -esp32c2 = { version = "0.27.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "abbd5169c3bcd926c0f3b5078a81c8d2d3849a42" } -esp32c3 = { version = "0.30.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "abbd5169c3bcd926c0f3b5078a81c8d2d3849a42" } -esp32c6 = { version = "0.21.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "abbd5169c3bcd926c0f3b5078a81c8d2d3849a42" } -esp32h2 = { version = "0.17.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "abbd5169c3bcd926c0f3b5078a81c8d2d3849a42" } -esp32s2 = { version = "0.29.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "abbd5169c3bcd926c0f3b5078a81c8d2d3849a42" } -esp32s3 = { version = "0.33.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "abbd5169c3bcd926c0f3b5078a81c8d2d3849a42" } +esp32 = { version = "0.38.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "aaacac954c30c19debd1c86fd6bbecf3ae554581" } +esp32c2 = { version = "0.27.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "aaacac954c30c19debd1c86fd6bbecf3ae554581" } +esp32c3 = { version = "0.30.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "aaacac954c30c19debd1c86fd6bbecf3ae554581" } +esp32c6 = { version = "0.21.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "aaacac954c30c19debd1c86fd6bbecf3ae554581" } +esp32h2 = { version = "0.17.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "aaacac954c30c19debd1c86fd6bbecf3ae554581" } +esp32s2 = { version = "0.29.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "aaacac954c30c19debd1c86fd6bbecf3ae554581" } +esp32s3 = { version = "0.33.0", features = ["critical-section", "rt"], optional = true, git = "https://github.com/esp-rs/esp-pacs", rev = "aaacac954c30c19debd1c86fd6bbecf3ae554581" } [target.'cfg(target_arch = "riscv32")'.dependencies] riscv = { version = "0.14.0", optional = true } diff --git a/esp-metadata-generated/src/_build_script_utils.rs b/esp-metadata-generated/src/_build_script_utils.rs index 70856c239..b2e948e92 100644 --- a/esp-metadata-generated/src/_build_script_utils.rs +++ b/esp-metadata-generated/src/_build_script_utils.rs @@ -735,7 +735,6 @@ impl Chip { "soc_has_uart0", "soc_has_uart1", "soc_has_uhci0", - "soc_has_uhci1", "soc_has_usb_device", "soc_has_xts_aes", "soc_has_dma_ch0", @@ -882,7 +881,6 @@ impl Chip { "cargo:rustc-cfg=soc_has_uart0", "cargo:rustc-cfg=soc_has_uart1", "cargo:rustc-cfg=soc_has_uhci0", - "cargo:rustc-cfg=soc_has_uhci1", "cargo:rustc-cfg=soc_has_usb_device", "cargo:rustc-cfg=soc_has_xts_aes", "cargo:rustc-cfg=soc_has_dma_ch0", @@ -2151,7 +2149,6 @@ impl Chip { "soc_has_uart1", "soc_has_uart2", "soc_has_uhci0", - "soc_has_uhci1", "soc_has_usb0", "soc_has_usb_device", "soc_has_usb_wrap", @@ -2334,7 +2331,6 @@ impl Chip { "cargo:rustc-cfg=soc_has_uart1", "cargo:rustc-cfg=soc_has_uart2", "cargo:rustc-cfg=soc_has_uhci0", - "cargo:rustc-cfg=soc_has_uhci1", "cargo:rustc-cfg=soc_has_usb0", "cargo:rustc-cfg=soc_has_usb_device", "cargo:rustc-cfg=soc_has_usb_wrap", diff --git a/esp-metadata-generated/src/_generated_esp32c3.rs b/esp-metadata-generated/src/_generated_esp32c3.rs index 0bb8a27da..88caeff81 100644 --- a/esp-metadata-generated/src/_generated_esp32c3.rs +++ b/esp-metadata-generated/src/_generated_esp32c3.rs @@ -512,24 +512,23 @@ macro_rules! for_each_peripheral { UART0(UART0 : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }))); _for_each_inner!((UART1 <= UART1(UART1 : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }))); - _for_each_inner!((UHCI0 <= UHCI0() (unstable))); _for_each_inner!((UHCI1 <= - UHCI1() (unstable))); _for_each_inner!((USB_DEVICE <= USB_DEVICE(USB_DEVICE : { - bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) - (unstable))); _for_each_inner!((XTS_AES <= XTS_AES() (unstable))); - _for_each_inner!((DMA_CH0 <= virtual() (unstable))); _for_each_inner!((DMA_CH1 <= - virtual() (unstable))); _for_each_inner!((DMA_CH2 <= virtual() (unstable))); - _for_each_inner!((ADC1 <= virtual() (unstable))); _for_each_inner!((ADC2 <= - virtual() (unstable))); _for_each_inner!((BT <= virtual() (unstable))); - _for_each_inner!((SW_INTERRUPT <= virtual() (unstable))); _for_each_inner!((TSENS - <= virtual() (unstable))); _for_each_inner!((WIFI <= virtual() (unstable))); - _for_each_inner!((all(GPIO0 <= virtual()), (GPIO1 <= virtual()), (GPIO2 <= - virtual()), (GPIO3 <= virtual()), (GPIO4 <= virtual()), (GPIO5 <= virtual()), - (GPIO6 <= virtual()), (GPIO7 <= virtual()), (GPIO8 <= virtual()), (GPIO9 <= - virtual()), (GPIO10 <= virtual()), (GPIO11 <= virtual()), (GPIO12 <= virtual()), - (GPIO13 <= virtual()), (GPIO14 <= virtual()), (GPIO15 <= virtual()), (GPIO16 <= - virtual()), (GPIO17 <= virtual()), (GPIO18 <= virtual()), (GPIO19 <= virtual()), - (GPIO20 <= virtual()), (GPIO21 <= virtual()), (AES <= AES(AES : { - bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) + _for_each_inner!((UHCI0 <= UHCI0() (unstable))); _for_each_inner!((USB_DEVICE <= + USB_DEVICE(USB_DEVICE : { bind_peri_interrupt, enable_peri_interrupt, + disable_peri_interrupt }) (unstable))); _for_each_inner!((XTS_AES <= XTS_AES() + (unstable))); _for_each_inner!((DMA_CH0 <= virtual() (unstable))); + _for_each_inner!((DMA_CH1 <= virtual() (unstable))); _for_each_inner!((DMA_CH2 <= + virtual() (unstable))); _for_each_inner!((ADC1 <= virtual() (unstable))); + _for_each_inner!((ADC2 <= virtual() (unstable))); _for_each_inner!((BT <= + virtual() (unstable))); _for_each_inner!((SW_INTERRUPT <= virtual() (unstable))); + _for_each_inner!((TSENS <= virtual() (unstable))); _for_each_inner!((WIFI <= + virtual() (unstable))); _for_each_inner!((all(GPIO0 <= virtual()), (GPIO1 <= + virtual()), (GPIO2 <= virtual()), (GPIO3 <= virtual()), (GPIO4 <= virtual()), + (GPIO5 <= virtual()), (GPIO6 <= virtual()), (GPIO7 <= virtual()), (GPIO8 <= + virtual()), (GPIO9 <= virtual()), (GPIO10 <= virtual()), (GPIO11 <= virtual()), + (GPIO12 <= virtual()), (GPIO13 <= virtual()), (GPIO14 <= virtual()), (GPIO15 <= + virtual()), (GPIO16 <= virtual()), (GPIO17 <= virtual()), (GPIO18 <= virtual()), + (GPIO19 <= virtual()), (GPIO20 <= virtual()), (GPIO21 <= virtual()), (AES <= + AES(AES : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) (unstable)), (APB_CTRL <= APB_CTRL() (unstable)), (APB_SARADC <= APB_SARADC() (unstable)), (ASSIST_DEBUG <= ASSIST_DEBUG() (unstable)), (BB <= BB() (unstable)), (DMA <= DMA() (unstable)), (DS <= DS() (unstable)), (EFUSE <= @@ -553,13 +552,13 @@ macro_rules! for_each_peripheral { UART0(UART0 : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt })), (UART1 <= UART1(UART1 : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt })), (UHCI0 <= UHCI0() (unstable)), - (UHCI1 <= UHCI1() (unstable)), (USB_DEVICE <= USB_DEVICE(USB_DEVICE : { - bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) - (unstable)), (XTS_AES <= XTS_AES() (unstable)), (DMA_CH0 <= virtual() - (unstable)), (DMA_CH1 <= virtual() (unstable)), (DMA_CH2 <= virtual() - (unstable)), (ADC1 <= virtual() (unstable)), (ADC2 <= virtual() (unstable)), (BT - <= virtual() (unstable)), (SW_INTERRUPT <= virtual() (unstable)), (TSENS <= - virtual() (unstable)), (WIFI <= virtual() (unstable)))); + (USB_DEVICE <= USB_DEVICE(USB_DEVICE : { bind_peri_interrupt, + enable_peri_interrupt, disable_peri_interrupt }) (unstable)), (XTS_AES <= + XTS_AES() (unstable)), (DMA_CH0 <= virtual() (unstable)), (DMA_CH1 <= virtual() + (unstable)), (DMA_CH2 <= virtual() (unstable)), (ADC1 <= virtual() (unstable)), + (ADC2 <= virtual() (unstable)), (BT <= virtual() (unstable)), (SW_INTERRUPT <= + virtual() (unstable)), (TSENS <= virtual() (unstable)), (WIFI <= virtual() + (unstable)))); }; } /// This macro can be used to generate code for each `GPIOn` instance. diff --git a/esp-metadata-generated/src/_generated_esp32s3.rs b/esp-metadata-generated/src/_generated_esp32s3.rs index d18c7b59b..48f95417b 100644 --- a/esp-metadata-generated/src/_generated_esp32s3.rs +++ b/esp-metadata-generated/src/_generated_esp32s3.rs @@ -569,72 +569,71 @@ macro_rules! for_each_peripheral { UART1(UART1 : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }))); _for_each_inner!((UART2 <= UART2(UART2 : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }))); - _for_each_inner!((UHCI0 <= UHCI0() (unstable))); _for_each_inner!((UHCI1 <= - UHCI1() (unstable))); _for_each_inner!((USB0 <= USB0() (unstable))); - _for_each_inner!((USB_DEVICE <= USB_DEVICE(USB_DEVICE : { bind_peri_interrupt, - enable_peri_interrupt, disable_peri_interrupt }) (unstable))); - _for_each_inner!((USB_WRAP <= USB_WRAP() (unstable))); _for_each_inner!((WCL <= - WCL() (unstable))); _for_each_inner!((XTS_AES <= XTS_AES() (unstable))); - _for_each_inner!((DMA_CH0 <= virtual() (unstable))); _for_each_inner!((DMA_CH1 <= - virtual() (unstable))); _for_each_inner!((DMA_CH2 <= virtual() (unstable))); - _for_each_inner!((DMA_CH3 <= virtual() (unstable))); _for_each_inner!((DMA_CH4 <= - virtual() (unstable))); _for_each_inner!((ADC1 <= virtual() (unstable))); - _for_each_inner!((ADC2 <= virtual() (unstable))); _for_each_inner!((BT <= - virtual() (unstable))); _for_each_inner!((CPU_CTRL <= virtual() (unstable))); - _for_each_inner!((PSRAM <= virtual() (unstable))); _for_each_inner!((SW_INTERRUPT - <= virtual() (unstable))); _for_each_inner!((ULP_RISCV_CORE <= virtual() - (unstable))); _for_each_inner!((WIFI <= virtual() (unstable))); - _for_each_inner!((all(GPIO0 <= virtual()), (GPIO1 <= virtual()), (GPIO2 <= - virtual()), (GPIO3 <= virtual()), (GPIO4 <= virtual()), (GPIO5 <= virtual()), - (GPIO6 <= virtual()), (GPIO7 <= virtual()), (GPIO8 <= virtual()), (GPIO9 <= - virtual()), (GPIO10 <= virtual()), (GPIO11 <= virtual()), (GPIO12 <= virtual()), - (GPIO13 <= virtual()), (GPIO14 <= virtual()), (GPIO15 <= virtual()), (GPIO16 <= - virtual()), (GPIO17 <= virtual()), (GPIO18 <= virtual()), (GPIO19 <= virtual()), - (GPIO20 <= virtual()), (GPIO21 <= virtual()), (GPIO26 <= virtual()), (GPIO27 <= - virtual()), (GPIO28 <= virtual()), (GPIO29 <= virtual()), (GPIO30 <= virtual()), - (GPIO31 <= virtual()), (GPIO32 <= virtual()), (GPIO33 <= virtual()), (GPIO34 <= - virtual()), (GPIO35 <= virtual()), (GPIO36 <= virtual()), (GPIO37 <= virtual()), - (GPIO38 <= virtual()), (GPIO39 <= virtual()), (GPIO40 <= virtual()), (GPIO41 <= - virtual()), (GPIO42 <= virtual()), (GPIO43 <= virtual()), (GPIO44 <= virtual()), - (GPIO45 <= virtual()), (GPIO46 <= virtual()), (GPIO47 <= virtual()), (GPIO48 <= - virtual()), (AES <= AES(AES : { bind_peri_interrupt, enable_peri_interrupt, - disable_peri_interrupt }) (unstable)), (APB_CTRL <= APB_CTRL() (unstable)), - (APB_SARADC <= APB_SARADC() (unstable)), (ASSIST_DEBUG <= ASSIST_DEBUG() - (unstable)), (DMA <= DMA() (unstable)), (DS <= DS() (unstable)), (EFUSE <= - EFUSE() (unstable)), (EXTMEM <= EXTMEM() (unstable)), (GPIO <= GPIO() - (unstable)), (GPIO_SD <= GPIO_SD() (unstable)), (HMAC <= HMAC() (unstable)), - (I2C0 <= I2C0(I2C_EXT0 : { bind_peri_interrupt, enable_peri_interrupt, - disable_peri_interrupt })), (I2C1 <= I2C1(I2C_EXT1 : { bind_peri_interrupt, - enable_peri_interrupt, disable_peri_interrupt })), (I2S0 <= I2S0(I2S0 : { + _for_each_inner!((UHCI0 <= UHCI0() (unstable))); _for_each_inner!((USB0 <= USB0() + (unstable))); _for_each_inner!((USB_DEVICE <= USB_DEVICE(USB_DEVICE : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) - (unstable)), (I2S1 <= I2S1(I2S1 : { bind_peri_interrupt, enable_peri_interrupt, - disable_peri_interrupt }) (unstable)), (INTERRUPT_CORE0 <= INTERRUPT_CORE0() - (unstable)), (INTERRUPT_CORE1 <= INTERRUPT_CORE1() (unstable)), (IO_MUX <= - IO_MUX() (unstable)), (LCD_CAM <= LCD_CAM() (unstable)), (LEDC <= LEDC() - (unstable)), (LPWR <= RTC_CNTL() (unstable)), (MCPWM0 <= MCPWM0() (unstable)), - (MCPWM1 <= MCPWM1() (unstable)), (PCNT <= PCNT() (unstable)), (PERI_BACKUP <= - PERI_BACKUP() (unstable)), (RMT <= RMT() (unstable)), (RNG <= RNG() (unstable)), - (RSA <= RSA(RSA : { bind_peri_interrupt, enable_peri_interrupt, - disable_peri_interrupt }) (unstable)), (RTC_CNTL <= RTC_CNTL() (unstable)), - (RTC_I2C <= RTC_I2C() (unstable)), (RTC_IO <= RTC_IO() (unstable)), (SDHOST <= - SDHOST() (unstable)), (SENS <= SENS() (unstable)), (SENSITIVE <= SENSITIVE() - (unstable)), (SHA <= SHA(SHA : { bind_peri_interrupt, enable_peri_interrupt, - disable_peri_interrupt }) (unstable)), (SPI0 <= SPI0() (unstable)), (SPI1 <= - SPI1() (unstable)), (SPI2 <= SPI2(SPI2 : { bind_peri_interrupt, - enable_peri_interrupt, disable_peri_interrupt })), (SPI3 <= SPI3(SPI3 : { - bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt })), (SYSTEM - <= SYSTEM() (unstable)), (SYSTIMER <= SYSTIMER() (unstable)), (TIMG0 <= TIMG0() - (unstable)), (TIMG1 <= TIMG1() (unstable)), (TWAI0 <= TWAI0() (unstable)), (UART0 - <= UART0(UART0 : { bind_peri_interrupt, enable_peri_interrupt, - disable_peri_interrupt })), (UART1 <= UART1(UART1 : { bind_peri_interrupt, - enable_peri_interrupt, disable_peri_interrupt })), (UART2 <= UART2(UART2 : { - bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt })), (UHCI0 <= - UHCI0() (unstable)), (UHCI1 <= UHCI1() (unstable)), (USB0 <= USB0() (unstable)), - (USB_DEVICE <= USB_DEVICE(USB_DEVICE : { bind_peri_interrupt, - enable_peri_interrupt, disable_peri_interrupt }) (unstable)), (USB_WRAP <= - USB_WRAP() (unstable)), (WCL <= WCL() (unstable)), (XTS_AES <= XTS_AES() - (unstable)), (DMA_CH0 <= virtual() (unstable)), (DMA_CH1 <= virtual() - (unstable)), (DMA_CH2 <= virtual() (unstable)), (DMA_CH3 <= virtual() + (unstable))); _for_each_inner!((USB_WRAP <= USB_WRAP() (unstable))); + _for_each_inner!((WCL <= WCL() (unstable))); _for_each_inner!((XTS_AES <= + XTS_AES() (unstable))); _for_each_inner!((DMA_CH0 <= virtual() (unstable))); + _for_each_inner!((DMA_CH1 <= virtual() (unstable))); _for_each_inner!((DMA_CH2 <= + virtual() (unstable))); _for_each_inner!((DMA_CH3 <= virtual() (unstable))); + _for_each_inner!((DMA_CH4 <= virtual() (unstable))); _for_each_inner!((ADC1 <= + virtual() (unstable))); _for_each_inner!((ADC2 <= virtual() (unstable))); + _for_each_inner!((BT <= virtual() (unstable))); _for_each_inner!((CPU_CTRL <= + virtual() (unstable))); _for_each_inner!((PSRAM <= virtual() (unstable))); + _for_each_inner!((SW_INTERRUPT <= virtual() (unstable))); + _for_each_inner!((ULP_RISCV_CORE <= virtual() (unstable))); + _for_each_inner!((WIFI <= virtual() (unstable))); _for_each_inner!((all(GPIO0 <= + virtual()), (GPIO1 <= virtual()), (GPIO2 <= virtual()), (GPIO3 <= virtual()), + (GPIO4 <= virtual()), (GPIO5 <= virtual()), (GPIO6 <= virtual()), (GPIO7 <= + virtual()), (GPIO8 <= virtual()), (GPIO9 <= virtual()), (GPIO10 <= virtual()), + (GPIO11 <= virtual()), (GPIO12 <= virtual()), (GPIO13 <= virtual()), (GPIO14 <= + virtual()), (GPIO15 <= virtual()), (GPIO16 <= virtual()), (GPIO17 <= virtual()), + (GPIO18 <= virtual()), (GPIO19 <= virtual()), (GPIO20 <= virtual()), (GPIO21 <= + virtual()), (GPIO26 <= virtual()), (GPIO27 <= virtual()), (GPIO28 <= virtual()), + (GPIO29 <= virtual()), (GPIO30 <= virtual()), (GPIO31 <= virtual()), (GPIO32 <= + virtual()), (GPIO33 <= virtual()), (GPIO34 <= virtual()), (GPIO35 <= virtual()), + (GPIO36 <= virtual()), (GPIO37 <= virtual()), (GPIO38 <= virtual()), (GPIO39 <= + virtual()), (GPIO40 <= virtual()), (GPIO41 <= virtual()), (GPIO42 <= virtual()), + (GPIO43 <= virtual()), (GPIO44 <= virtual()), (GPIO45 <= virtual()), (GPIO46 <= + virtual()), (GPIO47 <= virtual()), (GPIO48 <= virtual()), (AES <= AES(AES : { + bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) + (unstable)), (APB_CTRL <= APB_CTRL() (unstable)), (APB_SARADC <= APB_SARADC() + (unstable)), (ASSIST_DEBUG <= ASSIST_DEBUG() (unstable)), (DMA <= DMA() + (unstable)), (DS <= DS() (unstable)), (EFUSE <= EFUSE() (unstable)), (EXTMEM <= + EXTMEM() (unstable)), (GPIO <= GPIO() (unstable)), (GPIO_SD <= GPIO_SD() + (unstable)), (HMAC <= HMAC() (unstable)), (I2C0 <= I2C0(I2C_EXT0 : { + bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt })), (I2C1 <= + I2C1(I2C_EXT1 : { bind_peri_interrupt, enable_peri_interrupt, + disable_peri_interrupt })), (I2S0 <= I2S0(I2S0 : { bind_peri_interrupt, + enable_peri_interrupt, disable_peri_interrupt }) (unstable)), (I2S1 <= I2S1(I2S1 + : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) + (unstable)), (INTERRUPT_CORE0 <= INTERRUPT_CORE0() (unstable)), (INTERRUPT_CORE1 + <= INTERRUPT_CORE1() (unstable)), (IO_MUX <= IO_MUX() (unstable)), (LCD_CAM <= + LCD_CAM() (unstable)), (LEDC <= LEDC() (unstable)), (LPWR <= RTC_CNTL() + (unstable)), (MCPWM0 <= MCPWM0() (unstable)), (MCPWM1 <= MCPWM1() (unstable)), + (PCNT <= PCNT() (unstable)), (PERI_BACKUP <= PERI_BACKUP() (unstable)), (RMT <= + RMT() (unstable)), (RNG <= RNG() (unstable)), (RSA <= RSA(RSA : { + bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) + (unstable)), (RTC_CNTL <= RTC_CNTL() (unstable)), (RTC_I2C <= RTC_I2C() + (unstable)), (RTC_IO <= RTC_IO() (unstable)), (SDHOST <= SDHOST() (unstable)), + (SENS <= SENS() (unstable)), (SENSITIVE <= SENSITIVE() (unstable)), (SHA <= + SHA(SHA : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) + (unstable)), (SPI0 <= SPI0() (unstable)), (SPI1 <= SPI1() (unstable)), (SPI2 <= + SPI2(SPI2 : { bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt + })), (SPI3 <= SPI3(SPI3 : { bind_peri_interrupt, enable_peri_interrupt, + disable_peri_interrupt })), (SYSTEM <= SYSTEM() (unstable)), (SYSTIMER <= + SYSTIMER() (unstable)), (TIMG0 <= TIMG0() (unstable)), (TIMG1 <= TIMG1() + (unstable)), (TWAI0 <= TWAI0() (unstable)), (UART0 <= UART0(UART0 : { + bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt })), (UART1 <= + UART1(UART1 : { bind_peri_interrupt, enable_peri_interrupt, + disable_peri_interrupt })), (UART2 <= UART2(UART2 : { bind_peri_interrupt, + enable_peri_interrupt, disable_peri_interrupt })), (UHCI0 <= UHCI0() (unstable)), + (USB0 <= USB0() (unstable)), (USB_DEVICE <= USB_DEVICE(USB_DEVICE : { + bind_peri_interrupt, enable_peri_interrupt, disable_peri_interrupt }) + (unstable)), (USB_WRAP <= USB_WRAP() (unstable)), (WCL <= WCL() (unstable)), + (XTS_AES <= XTS_AES() (unstable)), (DMA_CH0 <= virtual() (unstable)), (DMA_CH1 <= + virtual() (unstable)), (DMA_CH2 <= virtual() (unstable)), (DMA_CH3 <= virtual() (unstable)), (DMA_CH4 <= virtual() (unstable)), (ADC1 <= virtual() (unstable)), (ADC2 <= virtual() (unstable)), (BT <= virtual() (unstable)), (CPU_CTRL <= virtual() (unstable)), (PSRAM <= virtual() (unstable)), (SW_INTERRUPT <= diff --git a/esp-metadata/devices/esp32c3.toml b/esp-metadata/devices/esp32c3.toml index 66cc78ec6..8217a7b0d 100644 --- a/esp-metadata/devices/esp32c3.toml +++ b/esp-metadata/devices/esp32c3.toml @@ -51,7 +51,6 @@ peripherals = [ { name = "UART0", interrupts = { peri = "UART0" } }, { name = "UART1", interrupts = { peri = "UART1" } }, { name = "UHCI0" }, - { name = "UHCI1" }, { name = "USB_DEVICE", interrupts = { peri = "USB_DEVICE" } }, { name = "XTS_AES" }, diff --git a/esp-metadata/devices/esp32s3.toml b/esp-metadata/devices/esp32s3.toml index 083be023b..5dd209af1 100644 --- a/esp-metadata/devices/esp32s3.toml +++ b/esp-metadata/devices/esp32s3.toml @@ -61,7 +61,6 @@ peripherals = [ { name = "UART1", interrupts = { peri = "UART1" } }, { name = "UART2", interrupts = { peri = "UART2" } }, { name = "UHCI0" }, - { name = "UHCI1" }, { name = "USB0" }, { name = "USB_DEVICE", interrupts = { peri = "USB_DEVICE" } }, { name = "USB_WRAP" },