Remove public hidden I2C APIs

esp-rs · Nov 7, 2024 · 12c3409 · 12c3409
1 parent 4c5be2c
commit 12c3409
Show file tree

Hide file tree

Showing 8 changed files with 364 additions and 381 deletions.
diff --git a/esp-hal/src/i2c.rs b/esp-hal/src/i2c.rs
diff --git a/esp-hal/src/soc/esp32/peripherals.rs b/esp-hal/src/soc/esp32/peripherals.rs
@@ -36,8 +36,8 @@ crate::peripherals! {
     GPIO <= GPIO (GPIO,GPIO_NMI),
     GPIO_SD <= GPIO_SD,
     HINF <= HINF,
-    I2C0 <= I2C0,
-    I2C1 <= I2C1,
+    [I2cExt0] I2C0 <= I2C0,
+    [I2cExt1] I2C1 <= I2C1,
     [I2s0] I2S0 <= I2S0 (I2S0),
     [I2s1] I2S1 <= I2S1 (I2S1),
     IO_MUX <= IO_MUX,

diff --git a/esp-hal/src/soc/esp32c2/peripherals.rs b/esp-hal/src/soc/esp32c2/peripherals.rs
@@ -29,7 +29,7 @@ crate::peripherals! {
     EFUSE <= EFUSE,
     EXTMEM <= EXTMEM,
     GPIO <= GPIO (GPIO,GPIO_NMI),
-    I2C0 <= I2C0,
+    [I2cExt0] I2C0 <= I2C0,
     INTERRUPT_CORE0 <= INTERRUPT_CORE0,
     IO_MUX <= IO_MUX,
     LEDC <= LEDC,

diff --git a/esp-hal/src/soc/esp32c3/peripherals.rs b/esp-hal/src/soc/esp32c3/peripherals.rs
@@ -33,7 +33,7 @@ crate::peripherals! {
     GPIO <= GPIO (GPIO,GPIO_NMI),
     GPIO_SD <= GPIO_SD,
     HMAC <= HMAC,
-    I2C0 <= I2C0,
+    [I2cExt0] I2C0 <= I2C0,
     [I2s0] I2S0 <= I2S0 (I2S0),
     INTERRUPT_CORE0 <= INTERRUPT_CORE0,
     IO_MUX <= IO_MUX,

diff --git a/esp-hal/src/soc/esp32c6/peripherals.rs b/esp-hal/src/soc/esp32c6/peripherals.rs
@@ -36,7 +36,7 @@ crate::peripherals! {
     HMAC <= HMAC,
     HP_APM <= HP_APM,
     HP_SYS <= HP_SYS,
-    I2C0 <= I2C0,
+    [I2cExt0] I2C0 <= I2C0,
     [I2s0] I2S0 <= I2S0 (I2S0),
     IEEE802154 <= IEEE802154,
     INTERRUPT_CORE0 <= INTERRUPT_CORE0,

diff --git a/esp-hal/src/soc/esp32h2/peripherals.rs b/esp-hal/src/soc/esp32h2/peripherals.rs
@@ -33,8 +33,8 @@ crate::peripherals! {
     HMAC <= HMAC,
     HP_APM <= HP_APM,
     HP_SYS <= HP_SYS,
-    I2C0 <= I2C0,
-    I2C1 <= I2C1,
+    [I2cExt0] I2C0 <= I2C0,
+    [I2cExt1] I2C1 <= I2C1,
     [I2s0] I2S0 <= I2S0 (I2S0),
     IEEE802154 <= IEEE802154,
     INTERRUPT_CORE0 <= INTERRUPT_CORE0,

diff --git a/esp-hal/src/soc/esp32s2/peripherals.rs b/esp-hal/src/soc/esp32s2/peripherals.rs
@@ -33,8 +33,8 @@ crate::peripherals! {
     GPIO <= GPIO (GPIO,GPIO_NMI),
     GPIO_SD <= GPIO_SD,
     HMAC <= HMAC,
-    I2C0 <= I2C0,
-    I2C1 <= I2C1,
+    [I2cExt0] I2C0 <= I2C0,
+    [I2cExt1] I2C1 <= I2C1,
     [I2s0] I2S0 <= I2S0 (I2S0),
     INTERRUPT_CORE0 <= INTERRUPT_CORE0,
     IO_MUX <= IO_MUX,

diff --git a/esp-hal/src/soc/esp32s3/peripherals.rs b/esp-hal/src/soc/esp32s3/peripherals.rs
@@ -34,8 +34,8 @@ crate::peripherals! {
     GPIO <= GPIO (GPIO,GPIO_NMI),
     GPIO_SD <= GPIO_SD,
     HMAC <= HMAC,
-    I2C0 <= I2C0,
-    I2C1 <= I2C1,
+    [I2cExt0] I2C0 <= I2C0,
+    [I2cExt1] I2C1 <= I2C1,
     [I2s0] I2S0 <= I2S0 (I2S0),
     [I2s1] I2S1 <= I2S1 (I2S1),
     INTERRUPT_CORE0 <= INTERRUPT_CORE0,