nrf: port to chiptool-based `nrf-pac`.

12 files changed, 82 insertions, 87 deletions

diff --git a/embassy-nrf/src/chips/nrf51.rs b/embassy-nrf/src/chips/nrf51.rs
index cc1cbc8a0..95fa926c3 100644
--- a/embassy-nrf/src/chips/nrf51.rs
+++ b/embassy-nrf/src/chips/nrf51.rs
@@ -1,4 +1,4 @@
-pub use nrf51_pac as pac;
+pub use nrf_pac as pac;
 
 /// The maximum buffer size that the EasyDMA can send/recv in one operation.
 pub const EASY_DMA_SIZE: usize = (1 << 14) - 1;
diff --git a/embassy-nrf/src/chips/nrf52805.rs b/embassy-nrf/src/chips/nrf52805.rs
index b51b0c93e..fc8db856c 100644
--- a/embassy-nrf/src/chips/nrf52805.rs
+++ b/embassy-nrf/src/chips/nrf52805.rs
@@ -1,4 +1,4 @@
-pub use nrf52805_pac as pac;
+pub use nrf_pac as pac;
 
 /// The maximum buffer size that the EasyDMA can send/recv in one operation.
 pub const EASY_DMA_SIZE: usize = (1 << 14) - 1;
diff --git a/embassy-nrf/src/chips/nrf52810.rs b/embassy-nrf/src/chips/nrf52810.rs
index 273098d9b..11a8b4dde 100644
--- a/embassy-nrf/src/chips/nrf52810.rs
+++ b/embassy-nrf/src/chips/nrf52810.rs
@@ -1,4 +1,4 @@
-pub use nrf52810_pac as pac;
+pub use nrf_pac as pac;
 
 /// The maximum buffer size that the EasyDMA can send/recv in one operation.
 pub const EASY_DMA_SIZE: usize = (1 << 10) - 1;
diff --git a/embassy-nrf/src/chips/nrf52811.rs b/embassy-nrf/src/chips/nrf52811.rs
index 9bce38636..077a36e31 100644
--- a/embassy-nrf/src/chips/nrf52811.rs
+++ b/embassy-nrf/src/chips/nrf52811.rs
@@ -1,4 +1,4 @@
-pub use nrf52811_pac as pac;
+pub use nrf_pac as pac;
 
 /// The maximum buffer size that the EasyDMA can send/recv in one operation.
 pub const EASY_DMA_SIZE: usize = (1 << 14) - 1;
diff --git a/embassy-nrf/src/chips/nrf52820.rs b/embassy-nrf/src/chips/nrf52820.rs
index 2acae2c8f..6ee16706d 100644
--- a/embassy-nrf/src/chips/nrf52820.rs
+++ b/embassy-nrf/src/chips/nrf52820.rs
@@ -1,4 +1,4 @@
-pub use nrf52820_pac as pac;
+pub use nrf_pac as pac;
 
 /// The maximum buffer size that the EasyDMA can send/recv in one operation.
 pub const EASY_DMA_SIZE: usize = (1 << 15) - 1;
diff --git a/embassy-nrf/src/chips/nrf52832.rs b/embassy-nrf/src/chips/nrf52832.rs
index 94b373ab3..4a7a29229 100644
--- a/embassy-nrf/src/chips/nrf52832.rs
+++ b/embassy-nrf/src/chips/nrf52832.rs
@@ -1,4 +1,4 @@
-pub use nrf52832_pac as pac;
+pub use nrf_pac as pac;
 
 /// The maximum buffer size that the EasyDMA can send/recv in one operation.
 pub const EASY_DMA_SIZE: usize = (1 << 8) - 1;
diff --git a/embassy-nrf/src/chips/nrf52833.rs b/embassy-nrf/src/chips/nrf52833.rs
index 09cde1ac1..6d70b763f 100644
--- a/embassy-nrf/src/chips/nrf52833.rs
+++ b/embassy-nrf/src/chips/nrf52833.rs
@@ -1,4 +1,4 @@
-pub use nrf52833_pac as pac;
+pub use nrf_pac as pac;
 
 /// The maximum buffer size that the EasyDMA can send/recv in one operation.
 pub const EASY_DMA_SIZE: usize = (1 << 16) - 1;
diff --git a/embassy-nrf/src/chips/nrf52840.rs b/embassy-nrf/src/chips/nrf52840.rs
index 0f3d1b250..b6afbf213 100644
--- a/embassy-nrf/src/chips/nrf52840.rs
+++ b/embassy-nrf/src/chips/nrf52840.rs
@@ -1,4 +1,4 @@
-pub use nrf52840_pac as pac;
+pub use nrf_pac as pac;
 
 /// The maximum buffer size that the EasyDMA can send/recv in one operation.
 pub const EASY_DMA_SIZE: usize = (1 << 16) - 1;
diff --git a/embassy-nrf/src/chips/nrf5340_app.rs b/embassy-nrf/src/chips/nrf5340_app.rs
index 584f6e43c..43588eef3 100644
--- a/embassy-nrf/src/chips/nrf5340_app.rs
+++ b/embassy-nrf/src/chips/nrf5340_app.rs
@@ -5,16 +5,17 @@ pub mod pac {
     // The nRF5340 has a secure and non-secure (NS) mode.
     // To avoid cfg spam, we remove _ns or _s suffixes here.
 
-    pub use nrf5340_app_pac::NVIC_PRIO_BITS;
+    #[cfg(feature="rt")]
+    pub use nrf_pac::NVIC_PRIO_BITS;
+    pub use nrf_pac::{common, shared};
 
     #[cfg(feature="rt")]
     #[doc(no_inline)]
-    pub use nrf5340_app_pac::interrupt;
+    pub use nrf_pac::interrupt;
 
     #[doc(no_inline)]
-    pub use nrf5340_app_pac::{
+    pub use nrf_pac::{
         Interrupt,
-        Peripherals,
 
         cache_s as cache,
         cachedata_s as cachedata,
@@ -26,11 +27,11 @@ pub mod pac {
         ctrlap_ns as ctrlap,
         dcnf_ns as dcnf,
         dppic_ns as dppic,
-        egu0_ns as egu0,
+        egu_ns as egu,
         ficr_s as ficr,
         fpu_ns as fpu,
-        gpiote0_s as gpiote,
-        i2s0_ns as i2s0,
+        gpiote_s as gpiote,
+        i2s_ns as i2s,
         ipc_ns as ipc,
         kmu_ns as kmu,
         lpcomp_ns as lpcomp,
@@ -38,36 +39,36 @@ pub mod pac {
         nfct_ns as nfct,
         nvmc_ns as nvmc,
         oscillators_ns as oscillators,
-        p0_ns as p0,
-        pdm0_ns as pdm,
+        gpio_ns as gpio,
+        pdm_ns as pdm,
         power_ns as power,
-        pwm0_ns as pwm0,
-        qdec0_ns as qdec,
+        pwm_ns as pwm,
+        qdec_ns as qdec,
         qspi_ns as qspi,
         regulators_ns as regulators,
         reset_ns as reset,
-        rtc0_ns as rtc0,
+        rtc_ns as rtc,
         saadc_ns as saadc,
-        spim0_ns as spim0,
-        spis0_ns as spis0,
+        spim_ns as spim,
+        spis_ns as spis,
         spu_s as spu,
         tad_s as tad,
-        timer0_ns as timer0,
-        twim0_ns as twim0,
-        twis0_ns as twis0,
-        uarte0_ns as uarte0,
+        timer_ns as timer,
+        twim_ns as twim,
+        twis_ns as twis,
+        uarte_ns as uarte,
         uicr_s as uicr,
         usbd_ns as usbd,
         usbregulator_ns as usbregulator,
         vmc_ns as vmc,
-        wdt0_ns as wdt0,
+        wdt_ns as wdt,
     };
     
     /// Non-Secure mode (NS) peripherals
     pub mod ns {
         #[cfg(feature = "nrf5340-app-ns")]
         #[doc(no_inline)]
-        pub use nrf5340_app_pac::{
+        pub use nrf_pac::{
             CLOCK_NS as CLOCK,
             COMP_NS as COMP,
             CTRLAP_NS as CTRLAP,
@@ -141,7 +142,7 @@ pub mod pac {
     pub mod s {
         #[cfg(feature = "nrf5340-app-s")]
         #[doc(no_inline)]
-        pub use nrf5340_app_pac::{
+        pub use nrf_pac::{
             CACHEDATA_S as CACHEDATA,
             CACHEINFO_S as CACHEINFO,
             CACHE_S as CACHE,
diff --git a/embassy-nrf/src/chips/nrf5340_net.rs b/embassy-nrf/src/chips/nrf5340_net.rs
index d772c9a49..00ff5fea6 100644
--- a/embassy-nrf/src/chips/nrf5340_net.rs
+++ b/embassy-nrf/src/chips/nrf5340_net.rs
@@ -5,16 +5,17 @@ pub mod pac {
     // The nRF5340 has a secure and non-secure (NS) mode.
     // To avoid cfg spam, we remove _ns or _s suffixes here.
 
-    pub use nrf5340_net_pac::NVIC_PRIO_BITS;
+    #[cfg(feature="rt")]
+    pub use nrf_pac::NVIC_PRIO_BITS;
+    pub use nrf_pac::{common, shared};
 
     #[cfg(feature="rt")]
     #[doc(no_inline)]
-    pub use nrf5340_net_pac::interrupt;
+    pub use nrf_pac::interrupt;
 
     #[doc(no_inline)]
-    pub use nrf5340_net_pac::{
+    pub use nrf_pac::{
         Interrupt,
-        Peripherals,
 
         aar_ns as aar,
         acl_ns as acl,
@@ -26,25 +27,25 @@ pub mod pac {
         dcnf_ns as dcnf,
         dppic_ns as dppic,
         ecb_ns as ecb,
-        egu0_ns as egu0,
+        egu_ns as egu,
         ficr_ns as ficr,
         gpiote_ns as gpiote,
         ipc_ns as ipc,
         nvmc_ns as nvmc,
-        p0_ns as p0,
+        gpio_ns as gpio,
         power_ns as power,
         radio_ns as radio,
         reset_ns as reset,
         rng_ns as rng,
-        rtc0_ns as rtc0,
-        spim0_ns as spim0,
-        spis0_ns as spis0,
-        swi0_ns as swi0,
+        rtc_ns as rtc,
+        spim_ns as spim,
+        spis_ns as spis,
+        swi_ns as swi,
         temp_ns as temp,
-        timer0_ns as timer0,
-        twim0_ns as twim0,
-        twis0_ns as twis0,
-        uarte0_ns as uarte0,
+        timer_ns as timer,
+        twim_ns as twim,
+        twis_ns as twis,
+        uarte_ns as uarte,
         uicr_ns as uicr,
         vmc_ns as vmc,
         vreqctrl_ns as vreqctrl,
@@ -54,25 +55,17 @@ pub mod pac {
         ACL_NS as ACL,
         APPMUTEX_NS as APPMUTEX,
         APPMUTEX_S as APPMUTEX_S,
-        CBP as CBP,
         CCM_NS as CCM,
         CLOCK_NS as CLOCK,
-        CPUID as CPUID,
         CTI_NS as CTI,
         CTRLAP_NS as CTRLAP,
-        DCB as DCB,
         DCNF_NS as DCNF,
         DPPIC_NS as DPPIC,
-        DWT as DWT,
         ECB_NS as ECB,
         EGU0_NS as EGU0,
         FICR_NS as FICR,
-        FPB as FPB,
         GPIOTE_NS as GPIOTE,
         IPC_NS as IPC,
-        ITM as ITM,
-        MPU as MPU,
-        NVIC as NVIC,
         NVMC_NS as NVMC,
         P0_NS as P0,
         P1_NS as P1,
@@ -82,19 +75,16 @@ pub mod pac {
         RNG_NS as RNG,
         RTC0_NS as RTC0,
         RTC1_NS as RTC1,
-        SCB as SCB,
         SPIM0_NS as SPIM0,
         SPIS0_NS as SPIS0,
         SWI0_NS as SWI0,
         SWI1_NS as SWI1,
         SWI2_NS as SWI2,
         SWI3_NS as SWI3,
-        SYST as SYST,
         TEMP_NS as TEMP,
         TIMER0_NS as TIMER0,
         TIMER1_NS as TIMER1,
         TIMER2_NS as TIMER2,
-        TPIU as TPIU,
         TWIM0_NS as TWIM0,
         TWIS0_NS as TWIS0,
         UARTE0_NS as UARTE0,
diff --git a/embassy-nrf/src/chips/nrf9120.rs b/embassy-nrf/src/chips/nrf9120.rs
index b53510118..b89570dcd 100644
--- a/embassy-nrf/src/chips/nrf9120.rs
+++ b/embassy-nrf/src/chips/nrf9120.rs
@@ -5,14 +5,16 @@ pub mod pac {
     // The nRF9120 has a secure and non-secure (NS) mode.
     // To avoid cfg spam, we remove _ns or _s suffixes here.
 
-    pub use nrf9120_pac::NVIC_PRIO_BITS;
+    #[cfg(feature="rt")]
+    pub use nrf_pac::NVIC_PRIO_BITS;
+    pub use nrf_pac::{common, shared};
 
     #[cfg(feature="rt")]
     #[doc(no_inline)]
-    pub use nrf9120_pac::interrupt;
+    pub use nrf_pac::interrupt;
 
     #[doc(no_inline)]
-    pub use nrf9120_pac::{
+    pub use nrf_pac::{
         Interrupt,
 
         cc_host_rgf_s as cc_host_rgf,
@@ -20,29 +22,29 @@ pub mod pac {
         cryptocell_s as cryptocell,
         ctrl_ap_peri_s as ctrl_ap_peri,
         dppic_ns as dppic,
-        egu0_ns as egu0,
+        egu_ns as egu,
         ficr_s as ficr,
         fpu_ns as fpu,
-        gpiote0_s as gpiote,
+        gpiote_s as gpiote,
         i2s_ns as i2s,
         ipc_ns as ipc,
         kmu_ns as kmu,
         nvmc_ns as nvmc,
-        p0_ns as p0,
+        gpio_ns as gpio,
         pdm_ns as pdm,
         power_ns as power,
-        pwm0_ns as pwm0,
+        pwm_ns as pwm,
         regulators_ns as regulators,
-        rtc0_ns as rtc0,
+        rtc_ns as rtc,
         saadc_ns as saadc,
-        spim0_ns as spim0,
-        spis0_ns as spis0,
+        spim_ns as spim,
+        spis_ns as spis,
         spu_s as spu,
         tad_s as tad,
-        timer0_ns as timer0,
-        twim0_ns as twim0,
-        twis0_ns as twis0,
-        uarte0_ns as uarte0,
+        timer_ns as timer,
+        twim_ns as twim,
+        twis_ns as twis,
+        uarte_ns as uarte,
         uicr_s as uicr,
         vmc_ns as vmc,
         wdt_ns as wdt,
@@ -51,7 +53,7 @@ pub mod pac {
     /// Non-Secure mode (NS) peripherals
     pub mod ns {
         #[doc(no_inline)]
-        pub use nrf9120_pac::{
+        pub use nrf_pac::{
             CLOCK_NS as CLOCK,
             DPPIC_NS as DPPIC,
             EGU0_NS as EGU0,
@@ -108,7 +110,7 @@ pub mod pac {
     /// Secure mode (S) peripherals
     pub mod s {
         #[doc(no_inline)]
-        pub use nrf9120_pac::{
+        pub use nrf_pac::{
             CC_HOST_RGF_S as CC_HOST_RGF,
             CLOCK_S as CLOCK,
             CRYPTOCELL_S as CRYPTOCELL,
@@ -121,7 +123,7 @@ pub mod pac {
             EGU4_S as EGU4,
             EGU5_S as EGU5,
             FICR_S as FICR,
-            FPU as FPU,
+            FPU_NS as FPU,
             GPIOTE0_S as GPIOTE0,
             I2S_S as I2S,
             IPC_S as IPC,
diff --git a/embassy-nrf/src/chips/nrf9160.rs b/embassy-nrf/src/chips/nrf9160.rs
index 8107ca175..dba3d1ef5 100644
--- a/embassy-nrf/src/chips/nrf9160.rs
+++ b/embassy-nrf/src/chips/nrf9160.rs
@@ -5,14 +5,16 @@ pub mod pac {
     // The nRF9160 has a secure and non-secure (NS) mode.
     // To avoid cfg spam, we remove _ns or _s suffixes here.
 
-    pub use nrf9160_pac::NVIC_PRIO_BITS;
+    #[cfg(feature="rt")]
+    pub use nrf_pac::NVIC_PRIO_BITS;
+    pub use nrf_pac::{common, shared};
 
     #[cfg(feature="rt")]
     #[doc(no_inline)]
-    pub use nrf9160_pac::interrupt;
+    pub use nrf_pac::interrupt;
 
     #[doc(no_inline)]
-    pub use nrf9160_pac::{
+    pub use nrf_pac::{
         Interrupt,
 
         cc_host_rgf_s as cc_host_rgf,
@@ -20,29 +22,29 @@ pub mod pac {
         cryptocell_s as cryptocell,
         ctrl_ap_peri_s as ctrl_ap_peri,
         dppic_ns as dppic,
-        egu0_ns as egu0,
+        egu_ns as egu,
         ficr_s as ficr,
         fpu_ns as fpu,
-        gpiote0_s as gpiote,
+        gpiote_s as gpiote,
         i2s_ns as i2s,
         ipc_ns as ipc,
         kmu_ns as kmu,
         nvmc_ns as nvmc,
-        p0_ns as p0,
+        gpio_ns as gpio,
         pdm_ns as pdm,
         power_ns as power,
-        pwm0_ns as pwm0,
+        pwm_ns as pwm,
         regulators_ns as regulators,
-        rtc0_ns as rtc0,
+        rtc_ns as rtc,
         saadc_ns as saadc,
-        spim0_ns as spim0,
-        spis0_ns as spis0,
+        spim_ns as spim,
+        spis_ns as spis,
         spu_s as spu,
         tad_s as tad,
-        timer0_ns as timer0,
-        twim0_ns as twim0,
-        twis0_ns as twis0,
-        uarte0_ns as uarte0,
+        timer_ns as timer,
+        twim_ns as twim,
+        twis_ns as twis,
+        uarte_ns as uarte,
         uicr_s as uicr,
         vmc_ns as vmc,
         wdt_ns as wdt,
@@ -51,7 +53,7 @@ pub mod pac {
     /// Non-Secure mode (NS) peripherals
     pub mod ns {
         #[doc(no_inline)]
-        pub use nrf9160_pac::{
+        pub use nrf_pac::{
             CLOCK_NS as CLOCK,
             DPPIC_NS as DPPIC,
             EGU0_NS as EGU0,
@@ -108,7 +110,7 @@ pub mod pac {
     /// Secure mode (S) peripherals
     pub mod s {
         #[doc(no_inline)]
-        pub use nrf9160_pac::{
+        pub use nrf_pac::{
             CC_HOST_RGF_S as CC_HOST_RGF,
             CLOCK_S as CLOCK,
             CRYPTOCELL_S as CRYPTOCELL,