Bump dependencies and svd files.

This change updates `cortex-m` dependency as well as `svd2rust`, which
required updating xtask source code too. Effectively, `svd2rust` was
the biggest update in terms of dependencies.

This also updates SVD files for all nRF chips to the latest version.

I presume this is going to introduce breaking changes all over the
place, so I also bumped the minor version (which is not exactly
semver, but it felt arrogant to bump the major).

Author: blkt

Cargo.toml

@@ -3,18 +3,18 @@ members = ["xtask", "pacs/*"]
 default-members = ["xtask"]
 
 [workspace.package]
-version = "0.12.2"
+version = "0.13.0"
 keywords = ["no-std", "arm", "cortex-m", "nrf", "peripherals"]
 license = "0BSD"
 repository = "https://github.com/nrf-rs/nrf-pacs"
 edition = "2018"
 readme = "README.md"
 
 [workspace.dependencies]
-cortex-m = "0.7.3"
+cortex-m = "0.7.7"
 vcell = "0.1.3"
 cortex-m-rt = ">=0.6.15,<0.8"
 
 # meta-dependencies (upgrade as needed, they apply to all PACs):
-# @svd2rust = 0.25.1
-# @form = 0.12.1
+# @svd2rust = 0.37.0
+# @form = 0.13.0

pacs/nrf51-pac/build.rs

@@ -1,3 +1,4 @@
+#![doc = r" Builder file for Peripheral access crate generated by svd2rust tool"]
 use std::env;
 use std::fs::File;
 use std::io::Write;

pacs/nrf51-pac/src/aar.rs

@@ -1,95 +1,167 @@
-#[doc = r"Register block"]
 #[repr(C)]
+#[doc = "Register block"]
 pub struct RegisterBlock {
-    #[doc = "0x00 - Start resolving addresses based on IRKs specified in the IRK data structure."]
-    pub tasks_start: TASKS_START,
+    tasks_start: TasksStart,
     _reserved1: [u8; 0x04],
-    #[doc = "0x08 - Stop resolving addresses."]
-    pub tasks_stop: TASKS_STOP,
+    tasks_stop: TasksStop,
     _reserved2: [u8; 0xf4],
+    events_end: EventsEnd,
+    events_resolved: EventsResolved,
+    events_notresolved: EventsNotresolved,
+    _reserved5: [u8; 0x01f8],
+    intenset: Intenset,
+    intenclr: Intenclr,
+    _reserved7: [u8; 0xf4],
+    status: Status,
+    _reserved8: [u8; 0xfc],
+    enable: Enable,
+    nirk: Nirk,
+    irkptr: Irkptr,
+    _reserved11: [u8; 0x04],
+    addrptr: Addrptr,
+    scratchptr: Scratchptr,
+    _reserved13: [u8; 0x0ae4],
+    power: Power,
+}
+impl RegisterBlock {
+    #[doc = "0x00 - Start resolving addresses based on IRKs specified in the IRK data structure."]
+    #[inline(always)]
+    pub const fn tasks_start(&self) -> &TasksStart {
+        &self.tasks_start
+    }
+    #[doc = "0x08 - Stop resolving addresses."]
+    #[inline(always)]
+    pub const fn tasks_stop(&self) -> &TasksStop {
+        &self.tasks_stop
+    }
     #[doc = "0x100 - Address resolution procedure completed."]
-    pub events_end: EVENTS_END,
+    #[inline(always)]
+    pub const fn events_end(&self) -> &EventsEnd {
+        &self.events_end
+    }
     #[doc = "0x104 - Address resolved."]
-    pub events_resolved: EVENTS_RESOLVED,
+    #[inline(always)]
+    pub const fn events_resolved(&self) -> &EventsResolved {
+        &self.events_resolved
+    }
     #[doc = "0x108 - Address not resolved."]
-    pub events_notresolved: EVENTS_NOTRESOLVED,
-    _reserved5: [u8; 0x01f8],
+    #[inline(always)]
+    pub const fn events_notresolved(&self) -> &EventsNotresolved {
+        &self.events_notresolved
+    }
     #[doc = "0x304 - Interrupt enable set register."]
-    pub intenset: INTENSET,
+    #[inline(always)]
+    pub const fn intenset(&self) -> &Intenset {
+        &self.intenset
+    }
     #[doc = "0x308 - Interrupt enable clear register."]
-    pub intenclr: INTENCLR,
-    _reserved7: [u8; 0xf4],
+    #[inline(always)]
+    pub const fn intenclr(&self) -> &Intenclr {
+        &self.intenclr
+    }
     #[doc = "0x400 - Resolution status."]
-    pub status: STATUS,
-    _reserved8: [u8; 0xfc],
+    #[inline(always)]
+    pub const fn status(&self) -> &Status {
+        &self.status
+    }
     #[doc = "0x500 - Enable AAR."]
-    pub enable: ENABLE,
+    #[inline(always)]
+    pub const fn enable(&self) -> &Enable {
+        &self.enable
+    }
     #[doc = "0x504 - Number of Identity root Keys in the IRK data structure."]
-    pub nirk: NIRK,
+    #[inline(always)]
+    pub const fn nirk(&self) -> &Nirk {
+        &self.nirk
+    }
     #[doc = "0x508 - Pointer to the IRK data structure."]
-    pub irkptr: IRKPTR,
-    _reserved11: [u8; 0x04],
+    #[inline(always)]
+    pub const fn irkptr(&self) -> &Irkptr {
+        &self.irkptr
+    }
     #[doc = "0x510 - Pointer to the resolvable address (6 bytes)."]
-    pub addrptr: ADDRPTR,
+    #[inline(always)]
+    pub const fn addrptr(&self) -> &Addrptr {
+        &self.addrptr
+    }
     #[doc = "0x514 - Pointer to a scratch data area used for temporary storage during resolution. A minimum of 3 bytes must be reserved."]
-    pub scratchptr: SCRATCHPTR,
-    _reserved13: [u8; 0x0ae4],
+    #[inline(always)]
+    pub const fn scratchptr(&self) -> &Scratchptr {
+        &self.scratchptr
+    }
     #[doc = "0xffc - Peripheral power control."]
-    pub power: POWER,
+    #[inline(always)]
+    pub const fn power(&self) -> &Power {
+        &self.power
+    }
 }
-#[doc = "TASKS_START (w) register accessor: an alias for `Reg<TASKS_START_SPEC>`"]
-pub type TASKS_START = crate::Reg<tasks_start::TASKS_START_SPEC>;
+#[doc = "TASKS_START (w) register accessor: Start resolving addresses based on IRKs specified in the IRK data structure.\n\nYou can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`tasks_start::W`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@tasks_start`] module"]
+#[doc(alias = "TASKS_START")]
+pub type TasksStart = crate::Reg<tasks_start::TasksStartSpec>;
 #[doc = "Start resolving addresses based on IRKs specified in the IRK data structure."]
 pub mod tasks_start;
-#[doc = "TASKS_STOP (w) register accessor: an alias for `Reg<TASKS_STOP_SPEC>`"]
-pub type TASKS_STOP = crate::Reg<tasks_stop::TASKS_STOP_SPEC>;
+#[doc = "TASKS_STOP (w) register accessor: Stop resolving addresses.\n\nYou can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`tasks_stop::W`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@tasks_stop`] module"]
+#[doc(alias = "TASKS_STOP")]
+pub type TasksStop = crate::Reg<tasks_stop::TasksStopSpec>;
 #[doc = "Stop resolving addresses."]
 pub mod tasks_stop;
-#[doc = "EVENTS_END (rw) register accessor: an alias for `Reg<EVENTS_END_SPEC>`"]
-pub type EVENTS_END = crate::Reg<events_end::EVENTS_END_SPEC>;
+#[doc = "EVENTS_END (rw) register accessor: Address resolution procedure completed.\n\nYou can [`read`](crate::Reg::read) this register and get [`events_end::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`events_end::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@events_end`] module"]
+#[doc(alias = "EVENTS_END")]
+pub type EventsEnd = crate::Reg<events_end::EventsEndSpec>;
 #[doc = "Address resolution procedure completed."]
 pub mod events_end;
-#[doc = "EVENTS_RESOLVED (rw) register accessor: an alias for `Reg<EVENTS_RESOLVED_SPEC>`"]
-pub type EVENTS_RESOLVED = crate::Reg<events_resolved::EVENTS_RESOLVED_SPEC>;
+#[doc = "EVENTS_RESOLVED (rw) register accessor: Address resolved.\n\nYou can [`read`](crate::Reg::read) this register and get [`events_resolved::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`events_resolved::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@events_resolved`] module"]
+#[doc(alias = "EVENTS_RESOLVED")]
+pub type EventsResolved = crate::Reg<events_resolved::EventsResolvedSpec>;
 #[doc = "Address resolved."]
 pub mod events_resolved;
-#[doc = "EVENTS_NOTRESOLVED (rw) register accessor: an alias for `Reg<EVENTS_NOTRESOLVED_SPEC>`"]
-pub type EVENTS_NOTRESOLVED = crate::Reg<events_notresolved::EVENTS_NOTRESOLVED_SPEC>;
+#[doc = "EVENTS_NOTRESOLVED (rw) register accessor: Address not resolved.\n\nYou can [`read`](crate::Reg::read) this register and get [`events_notresolved::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`events_notresolved::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@events_notresolved`] module"]
+#[doc(alias = "EVENTS_NOTRESOLVED")]
+pub type EventsNotresolved = crate::Reg<events_notresolved::EventsNotresolvedSpec>;
 #[doc = "Address not resolved."]
 pub mod events_notresolved;
-#[doc = "INTENSET (rw) register accessor: an alias for `Reg<INTENSET_SPEC>`"]
-pub type INTENSET = crate::Reg<intenset::INTENSET_SPEC>;
+#[doc = "INTENSET (rw) register accessor: Interrupt enable set register.\n\nYou can [`read`](crate::Reg::read) this register and get [`intenset::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`intenset::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@intenset`] module"]
+#[doc(alias = "INTENSET")]
+pub type Intenset = crate::Reg<intenset::IntensetSpec>;
 #[doc = "Interrupt enable set register."]
 pub mod intenset;
-#[doc = "INTENCLR (rw) register accessor: an alias for `Reg<INTENCLR_SPEC>`"]
-pub type INTENCLR = crate::Reg<intenclr::INTENCLR_SPEC>;
+#[doc = "INTENCLR (rw) register accessor: Interrupt enable clear register.\n\nYou can [`read`](crate::Reg::read) this register and get [`intenclr::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`intenclr::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@intenclr`] module"]
+#[doc(alias = "INTENCLR")]
+pub type Intenclr = crate::Reg<intenclr::IntenclrSpec>;
 #[doc = "Interrupt enable clear register."]
 pub mod intenclr;
-#[doc = "STATUS (r) register accessor: an alias for `Reg<STATUS_SPEC>`"]
-pub type STATUS = crate::Reg<status::STATUS_SPEC>;
+#[doc = "STATUS (r) register accessor: Resolution status.\n\nYou can [`read`](crate::Reg::read) this register and get [`status::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@status`] module"]
+#[doc(alias = "STATUS")]
+pub type Status = crate::Reg<status::StatusSpec>;
 #[doc = "Resolution status."]
 pub mod status;
-#[doc = "ENABLE (rw) register accessor: an alias for `Reg<ENABLE_SPEC>`"]
-pub type ENABLE = crate::Reg<enable::ENABLE_SPEC>;
+#[doc = "ENABLE (rw) register accessor: Enable AAR.\n\nYou can [`read`](crate::Reg::read) this register and get [`enable::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`enable::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@enable`] module"]
+#[doc(alias = "ENABLE")]
+pub type Enable = crate::Reg<enable::EnableSpec>;
 #[doc = "Enable AAR."]
 pub mod enable;
-#[doc = "NIRK (rw) register accessor: an alias for `Reg<NIRK_SPEC>`"]
-pub type NIRK = crate::Reg<nirk::NIRK_SPEC>;
+#[doc = "NIRK (rw) register accessor: Number of Identity root Keys in the IRK data structure.\n\nYou can [`read`](crate::Reg::read) this register and get [`nirk::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`nirk::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@nirk`] module"]
+#[doc(alias = "NIRK")]
+pub type Nirk = crate::Reg<nirk::NirkSpec>;
 #[doc = "Number of Identity root Keys in the IRK data structure."]
 pub mod nirk;
-#[doc = "IRKPTR (rw) register accessor: an alias for `Reg<IRKPTR_SPEC>`"]
-pub type IRKPTR = crate::Reg<irkptr::IRKPTR_SPEC>;
+#[doc = "IRKPTR (rw) register accessor: Pointer to the IRK data structure.\n\nYou can [`read`](crate::Reg::read) this register and get [`irkptr::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`irkptr::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@irkptr`] module"]
+#[doc(alias = "IRKPTR")]
+pub type Irkptr = crate::Reg<irkptr::IrkptrSpec>;
 #[doc = "Pointer to the IRK data structure."]
 pub mod irkptr;
-#[doc = "ADDRPTR (rw) register accessor: an alias for `Reg<ADDRPTR_SPEC>`"]
-pub type ADDRPTR = crate::Reg<addrptr::ADDRPTR_SPEC>;
+#[doc = "ADDRPTR (rw) register accessor: Pointer to the resolvable address (6 bytes).\n\nYou can [`read`](crate::Reg::read) this register and get [`addrptr::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`addrptr::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@addrptr`] module"]
+#[doc(alias = "ADDRPTR")]
+pub type Addrptr = crate::Reg<addrptr::AddrptrSpec>;
 #[doc = "Pointer to the resolvable address (6 bytes)."]
 pub mod addrptr;
-#[doc = "SCRATCHPTR (rw) register accessor: an alias for `Reg<SCRATCHPTR_SPEC>`"]
-pub type SCRATCHPTR = crate::Reg<scratchptr::SCRATCHPTR_SPEC>;
+#[doc = "SCRATCHPTR (rw) register accessor: Pointer to a scratch data area used for temporary storage during resolution. A minimum of 3 bytes must be reserved.\n\nYou can [`read`](crate::Reg::read) this register and get [`scratchptr::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`scratchptr::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@scratchptr`] module"]
+#[doc(alias = "SCRATCHPTR")]
+pub type Scratchptr = crate::Reg<scratchptr::ScratchptrSpec>;
 #[doc = "Pointer to a scratch data area used for temporary storage during resolution. A minimum of 3 bytes must be reserved."]
 pub mod scratchptr;
-#[doc = "POWER (rw) register accessor: an alias for `Reg<POWER_SPEC>`"]
-pub type POWER = crate::Reg<power::POWER_SPEC>;
+#[doc = "POWER (rw) register accessor: Peripheral power control.\n\nYou can [`read`](crate::Reg::read) this register and get [`power::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`power::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@power`] module"]
+#[doc(alias = "POWER")]
+pub type Power = crate::Reg<power::PowerSpec>;
 #[doc = "Peripheral power control."]
 pub mod power;

pacs/nrf51-pac/src/aar/addrptr.rs

@@ -1,64 +1,23 @@
 #[doc = "Register `ADDRPTR` reader"]
-pub struct R(crate::R<ADDRPTR_SPEC>);
-impl core::ops::Deref for R {
-    type Target = crate::R<ADDRPTR_SPEC>;
-    #[inline(always)]
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-impl From<crate::R<ADDRPTR_SPEC>> for R {
-    #[inline(always)]
-    fn from(reader: crate::R<ADDRPTR_SPEC>) -> Self {
-        R(reader)
-    }
-}
+pub type R = crate::R<AddrptrSpec>;
 #[doc = "Register `ADDRPTR` writer"]
-pub struct W(crate::W<ADDRPTR_SPEC>);
-impl core::ops::Deref for W {
-    type Target = crate::W<ADDRPTR_SPEC>;
-    #[inline(always)]
-    fn deref(&self) -> &Self::Target {
-        &self.0
+pub type W = crate::W<AddrptrSpec>;
+impl core::fmt::Debug for R {
+    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+        write!(f, "{}", self.bits())
     }
 }
-impl core::ops::DerefMut for W {
-    #[inline(always)]
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-impl From<crate::W<ADDRPTR_SPEC>> for W {
-    #[inline(always)]
-    fn from(writer: crate::W<ADDRPTR_SPEC>) -> Self {
-        W(writer)
-    }
-}
-impl W {
-    #[doc = "Writes raw bits to the register."]
-    #[inline(always)]
-    pub unsafe fn bits(&mut self, bits: u32) -> &mut Self {
-        self.0.bits(bits);
-        self
-    }
-}
-#[doc = "Pointer to the resolvable address (6 bytes).\n\nThis register you can [`read`](crate::generic::Reg::read), [`write_with_zero`](crate::generic::Reg::write_with_zero), [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`modify`](crate::generic::Reg::modify). See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [addrptr](index.html) module"]
-pub struct ADDRPTR_SPEC;
-impl crate::RegisterSpec for ADDRPTR_SPEC {
+impl W {}
+#[doc = "Pointer to the resolvable address (6 bytes).\n\nYou can [`read`](crate::Reg::read) this register and get [`addrptr::R`](R). You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`addrptr::W`](W). You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
+pub struct AddrptrSpec;
+impl crate::RegisterSpec for AddrptrSpec {
     type Ux = u32;
 }
-#[doc = "`read()` method returns [addrptr::R](R) reader structure"]
-impl crate::Readable for ADDRPTR_SPEC {
-    type Reader = R;
-}
-#[doc = "`write(|w| ..)` method takes [addrptr::W](W) writer structure"]
-impl crate::Writable for ADDRPTR_SPEC {
-    type Writer = W;
+#[doc = "`read()` method returns [`addrptr::R`](R) reader structure"]
+impl crate::Readable for AddrptrSpec {}
+#[doc = "`write(|w| ..)` method takes [`addrptr::W`](W) writer structure"]
+impl crate::Writable for AddrptrSpec {
+    type Safety = crate::Unsafe;
 }
 #[doc = "`reset()` method sets ADDRPTR to value 0"]
-impl crate::Resettable for ADDRPTR_SPEC {
-    #[inline(always)]
-    fn reset_value() -> Self::Ux {
-        0
-    }
-}
+impl crate::Resettable for AddrptrSpec {}