Put everything about the 811 in line with the other nrfs in terms of naming

Author: Yatekii

nrf-hal-common/src/ppi/event_nrf52811.rs

@@ -22,7 +22,7 @@ impl Event for crate::pac::uarte0::EVENTS_RXTO {}
 impl Event for crate::pac::uarte0::EVENTS_RXSTARTED {}
 impl Event for crate::pac::uarte0::EVENTS_TXSTARTED {}
 impl Event for crate::pac::uarte0::EVENTS_TXSTOPPED {}
-impl Event for crate::pac::spi1::EVENTS_READY {}
+impl Event for crate::pac::spi0::EVENTS_READY {}
 impl Event for crate::pac::uart0::EVENTS_CTS {}
 impl Event for crate::pac::uart0::EVENTS_NCTS {}
 impl Event for crate::pac::uart0::EVENTS_RXDRDY {}
@@ -33,9 +33,9 @@ impl Event for crate::pac::clock::EVENTS_HFCLKSTARTED {}
 impl Event for crate::pac::clock::EVENTS_LFCLKSTARTED {}
 impl Event for crate::pac::clock::EVENTS_DONE {}
 impl Event for crate::pac::clock::EVENTS_CTTO {}
-impl Event for crate::pac::spis1::EVENTS_END {}
-impl Event for crate::pac::spis1::EVENTS_ENDRX {}
-impl Event for crate::pac::spis1::EVENTS_ACQUIRED {}
+impl Event for crate::pac::spis0::EVENTS_END {}
+impl Event for crate::pac::spis0::EVENTS_ENDRX {}
+impl Event for crate::pac::spis0::EVENTS_ACQUIRED {}
 impl Event for crate::pac::ecb::EVENTS_ENDECB {}
 impl Event for crate::pac::ecb::EVENTS_ERRORECB {}
 impl Event for crate::pac::timer0::EVENTS_COMPARE {}
@@ -108,11 +108,11 @@ impl Event for crate::pac::saadc::EVENTS_DONE {}
 impl Event for crate::pac::saadc::EVENTS_RESULTDONE {}
 impl Event for crate::pac::saadc::EVENTS_CALIBRATEDONE {}
 impl Event for crate::pac::saadc::EVENTS_STOPPED {}
-impl Event for crate::pac::spim1::EVENTS_STOPPED {}
-impl Event for crate::pac::spim1::EVENTS_ENDRX {}
-impl Event for crate::pac::spim1::EVENTS_END {}
-impl Event for crate::pac::spim1::EVENTS_ENDTX {}
-impl Event for crate::pac::spim1::EVENTS_STARTED {}
+impl Event for crate::pac::spim0::EVENTS_STOPPED {}
+impl Event for crate::pac::spim0::EVENTS_ENDRX {}
+impl Event for crate::pac::spim0::EVENTS_END {}
+impl Event for crate::pac::spim0::EVENTS_ENDTX {}
+impl Event for crate::pac::spim0::EVENTS_STARTED {}
 impl Event for crate::pac::power::EVENTS_POFWARN {}
 impl Event for crate::pac::power::EVENTS_SLEEPENTER {}
 impl Event for crate::pac::power::EVENTS_SLEEPEXIT {}

nrf-hal-common/src/ppi/task_nrf52811.rs

@@ -8,14 +8,10 @@ use crate::ppi::Task;
 //   `^src/(.*)\.rs:pub type (.*) = .*$`
 // Replace (regex):
 //   `impl Task for crate::pac::$1::$2 { }`
-// Find (regex):
-//   `^impl Task for crate::pac::spim0::(.*)$`
-// Replace (regex):
-//   `impl Task for crate::pac::spim1::$1`
-impl Task for crate::pac::spim1::TASKS_START {}
-impl Task for crate::pac::spim1::TASKS_STOP {}
-impl Task for crate::pac::spim1::TASKS_SUSPEND {}
-impl Task for crate::pac::spim1::TASKS_RESUME {}
+impl Task for crate::pac::spim0::TASKS_START {}
+impl Task for crate::pac::spim0::TASKS_STOP {}
+impl Task for crate::pac::spim0::TASKS_SUSPEND {}
+impl Task for crate::pac::spim0::TASKS_RESUME {}
 impl Task for crate::pac::rng::TASKS_START {}
 impl Task for crate::pac::rng::TASKS_STOP {}
 impl Task for crate::pac::timer0::TASKS_START {}
@@ -24,8 +20,8 @@ impl Task for crate::pac::timer0::TASKS_COUNT {}
 impl Task for crate::pac::timer0::TASKS_CLEAR {}
 impl Task for crate::pac::timer0::TASKS_SHUTDOWN {}
 impl Task for crate::pac::timer0::TASKS_CAPTURE {}
-impl Task for crate::pac::spis1::TASKS_ACQUIRE {}
-impl Task for crate::pac::spis1::TASKS_RELEASE {}
+impl Task for crate::pac::spis0::TASKS_ACQUIRE {}
+impl Task for crate::pac::spis0::TASKS_RELEASE {}
 impl Task for crate::pac::uart0::TASKS_STARTRX {}
 impl Task for crate::pac::uart0::TASKS_STOPRX {}
 impl Task for crate::pac::uart0::TASKS_STARTTX {}

nrf-hal-common/src/spim.rs

@@ -8,17 +8,17 @@ use core::sync::atomic::{compiler_fence, Ordering::SeqCst};
 #[cfg(feature = "9160")]
 use crate::pac::{spim0_ns as spim0, SPIM0_NS as SPIM0};
 
-#[cfg(feature = "52811")]
-use crate::pac::{spim1 as spim0, SPIM0, SPIM1};
-
-#[cfg(not(any(feature = "9160", feature = "52811")))]
+#[cfg(not(feature = "9160"))]
 use crate::pac::{spim0, SPIM0};
 
 pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
 pub use spim0::frequency::FREQUENCY_A as Frequency;
 
 use core::iter::repeat_with;
 
+#[cfg(feature = "52811")]
+use crate::pac::SPIM1;
+
 #[cfg(any(feature = "52832", feature = "52833", feature = "52840"))]
 use crate::pac::{SPIM1, SPIM2};
 

nrf-hal-common/src/spis.rs

@@ -15,20 +15,15 @@ use crate::pac::{
     SPIS0_NS as SPIS0,
 };
 
-#[cfg(feature = "52811")]
-use crate::pac::{
-    spis1::{
-        self as spis0, _EVENTS_ACQUIRED, _EVENTS_END, _EVENTS_ENDRX, _TASKS_ACQUIRE, _TASKS_RELEASE,
-    },
-    SPIS0, SPIS1,
-};
-
-#[cfg(not(any(feature = "9160", feature = "52811")))]
+#[cfg(not(feature = "9160"))]
 use crate::pac::{
     spis0::{self, _EVENTS_ACQUIRED, _EVENTS_END, _EVENTS_ENDRX, _TASKS_ACQUIRE, _TASKS_RELEASE},
     SPIS0,
 };
 
+#[cfg(feature = "52811")]
+use crate::pac::SPIS1;
+
 #[cfg(any(feature = "52832", feature = "52833", feature = "52840"))]
 use crate::pac::{SPIS1, SPIS2};
 
@@ -619,16 +614,18 @@ impl Instance for SPIS0 {
     const INTERRUPT: Interrupt = Interrupt::SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0;
     #[cfg(feature = "9160")]
     const INTERRUPT: Interrupt = Interrupt::UARTE0_SPIM0_SPIS0_TWIM0_TWIS0;
-    #[cfg(any(feature = "52811", feature = "52810"))]
+    #[cfg(feature = "52810")]
     const INTERRUPT: Interrupt = Interrupt::SPIM0_SPIS0_SPI0;
+    #[cfg(feature = "52811")]
+    const INTERRUPT: Interrupt = Interrupt::TWIM0_TWIS0_TWI0_SPIM0_SPIS0_SPI0;
 }
 
 #[cfg(not(any(feature = "9160", feature = "52810")))]
 impl Instance for SPIS1 {
     #[cfg(not(feature = "52811"))]
     const INTERRUPT: Interrupt = Interrupt::SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1;
     #[cfg(feature = "52811")]
-    const INTERRUPT: Interrupt = Interrupt::TWIM0_TWIS0_TWI0_SPIM1_SPIS1_SPI1;
+    const INTERRUPT: Interrupt = Interrupt::SPIM1_SPIS1_SPI1;
 }
 
 #[cfg(not(any(feature = "9160", feature = "52811", feature = "52810")))]

nrf52811-hal/Cargo.toml

@@ -16,7 +16,7 @@ keywords = ["arm", "cortex-m", "nrf52", "hal", "nrf52811"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-nrf52811-pac = "0.9.0"
+nrf52811-pac = "0.9.1"
 
 [dependencies.nrf-hal-common]
 path = "../nrf-hal-common"