Merge pull request #23 from riscv-rust/update_deps

update to svd2rust v0.19.0

Author: almindor

src/common/aonclk.rs

@@ -1,18 +1,11 @@
 #[doc = r"Register block"]
 #[repr(C)]
 pub struct RegisterBlock {
-    _reserved0: [u8; 112usize],
+    _reserved0: [u8; 0x70],
     #[doc = "0x70 - AON Clock Configuration Register"]
-    pub lfrosccfg: LFROSCCFG,
+    pub lfrosccfg: crate::Reg<lfrosccfg::LFROSCCFG_SPEC>,
 }
-#[doc = "AON Clock Configuration Register\n\nThis register you can [`read`](crate::generic::Reg::read), [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`write_with_zero`](crate::generic::Reg::write_with_zero), [`modify`](crate::generic::Reg::modify). See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [lfrosccfg](lfrosccfg) module"]
-pub type LFROSCCFG = crate::Reg<u32, _LFROSCCFG>;
-#[allow(missing_docs)]
-#[doc(hidden)]
-pub struct _LFROSCCFG;
-#[doc = "`read()` method returns [lfrosccfg::R](lfrosccfg::R) reader structure"]
-impl crate::Readable for LFROSCCFG {}
-#[doc = "`write(|w| ..)` method takes [lfrosccfg::W](lfrosccfg::W) writer structure"]
-impl crate::Writable for LFROSCCFG {}
+#[doc = "lfrosccfg register accessor: an alias for `Reg<LFROSCCFG_SPEC>`"]
+pub type LFROSCCFG = crate::Reg<lfrosccfg::LFROSCCFG_SPEC>;
 #[doc = "AON Clock Configuration Register"]
 pub mod lfrosccfg;

src/common/aonclk/lfrosccfg.rs

@@ -1,18 +1,54 @@
-#[doc = "Reader of register lfrosccfg"]
-pub type R = crate::R<u32, super::LFROSCCFG>;
-#[doc = "Writer for register lfrosccfg"]
-pub type W = crate::W<u32, super::LFROSCCFG>;
-#[doc = "Register lfrosccfg `reset()`'s with value 0"]
-impl crate::ResetValue for super::LFROSCCFG {
-    type Type = u32;
-    #[inline(always)]
-    fn reset_value() -> Self::Type {
-        0
+#[doc = "Register `lfrosccfg` reader"]
+pub struct R(crate::R<LFROSCCFG_SPEC>);
+impl core::ops::Deref for R {
+    type Target = crate::R<LFROSCCFG_SPEC>;
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl From<crate::R<LFROSCCFG_SPEC>> for R {
+    #[inline(always)]
+    fn from(reader: crate::R<LFROSCCFG_SPEC>) -> Self {
+        R(reader)
+    }
+}
+#[doc = "Register `lfrosccfg` writer"]
+pub struct W(crate::W<LFROSCCFG_SPEC>);
+impl core::ops::Deref for W {
+    type Target = crate::W<LFROSCCFG_SPEC>;
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl core::ops::DerefMut for W {
+    #[inline(always)]
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
     }
 }
-#[doc = "Reader of field `ready`"]
-pub type READY_R = crate::R<bool, bool>;
-#[doc = "Write proxy for field `ready`"]
+impl From<crate::W<LFROSCCFG_SPEC>> for W {
+    #[inline(always)]
+    fn from(writer: crate::W<LFROSCCFG_SPEC>) -> Self {
+        W(writer)
+    }
+}
+#[doc = "Field `ready` reader - "]
+pub struct READY_R(crate::FieldReader<bool, bool>);
+impl READY_R {
+    pub(crate) fn new(bits: bool) -> Self {
+        READY_R(crate::FieldReader::new(bits))
+    }
+}
+impl core::ops::Deref for READY_R {
+    type Target = crate::FieldReader<bool, bool>;
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+#[doc = "Field `ready` writer - "]
 pub struct READY_W<'a> {
     w: &'a mut W,
 }
@@ -30,13 +66,25 @@ impl<'a> READY_W<'a> {
     #[doc = r"Writes raw bits to the field"]
     #[inline(always)]
     pub fn bit(self, value: bool) -> &'a mut W {
-        self.w.bits = (self.w.bits & !(0x01 << 31)) | (((value as u32) & 0x01) << 31);
+        self.w.bits = (self.w.bits & !(0x01 << 31)) | ((value as u32 & 0x01) << 31);
         self.w
     }
 }
-#[doc = "Reader of field `enable`"]
-pub type ENABLE_R = crate::R<bool, bool>;
-#[doc = "Write proxy for field `enable`"]
+#[doc = "Field `enable` reader - "]
+pub struct ENABLE_R(crate::FieldReader<bool, bool>);
+impl ENABLE_R {
+    pub(crate) fn new(bits: bool) -> Self {
+        ENABLE_R(crate::FieldReader::new(bits))
+    }
+}
+impl core::ops::Deref for ENABLE_R {
+    type Target = crate::FieldReader<bool, bool>;
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+#[doc = "Field `enable` writer - "]
 pub struct ENABLE_W<'a> {
     w: &'a mut W,
 }
@@ -54,35 +102,59 @@ impl<'a> ENABLE_W<'a> {
     #[doc = r"Writes raw bits to the field"]
     #[inline(always)]
     pub fn bit(self, value: bool) -> &'a mut W {
-        self.w.bits = (self.w.bits & !(0x01 << 30)) | (((value as u32) & 0x01) << 30);
+        self.w.bits = (self.w.bits & !(0x01 << 30)) | ((value as u32 & 0x01) << 30);
         self.w
     }
 }
-#[doc = "Reader of field `trim`"]
-pub type TRIM_R = crate::R<u8, u8>;
-#[doc = "Write proxy for field `trim`"]
+#[doc = "Field `trim` reader - "]
+pub struct TRIM_R(crate::FieldReader<u8, u8>);
+impl TRIM_R {
+    pub(crate) fn new(bits: u8) -> Self {
+        TRIM_R(crate::FieldReader::new(bits))
+    }
+}
+impl core::ops::Deref for TRIM_R {
+    type Target = crate::FieldReader<u8, u8>;
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+#[doc = "Field `trim` writer - "]
 pub struct TRIM_W<'a> {
     w: &'a mut W,
 }
 impl<'a> TRIM_W<'a> {
     #[doc = r"Writes raw bits to the field"]
     #[inline(always)]
     pub unsafe fn bits(self, value: u8) -> &'a mut W {
-        self.w.bits = (self.w.bits & !(0x1f << 16)) | (((value as u32) & 0x1f) << 16);
+        self.w.bits = (self.w.bits & !(0x1f << 16)) | ((value as u32 & 0x1f) << 16);
         self.w
     }
 }
-#[doc = "Reader of field `div`"]
-pub type DIV_R = crate::R<u8, u8>;
-#[doc = "Write proxy for field `div`"]
+#[doc = "Field `div` reader - "]
+pub struct DIV_R(crate::FieldReader<u8, u8>);
+impl DIV_R {
+    pub(crate) fn new(bits: u8) -> Self {
+        DIV_R(crate::FieldReader::new(bits))
+    }
+}
+impl core::ops::Deref for DIV_R {
+    type Target = crate::FieldReader<u8, u8>;
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+#[doc = "Field `div` writer - "]
 pub struct DIV_W<'a> {
     w: &'a mut W,
 }
 impl<'a> DIV_W<'a> {
     #[doc = r"Writes raw bits to the field"]
     #[inline(always)]
     pub unsafe fn bits(self, value: u8) -> &'a mut W {
-        self.w.bits = (self.w.bits & !0x3f) | ((value as u32) & 0x3f);
+        self.w.bits = (self.w.bits & !0x3f) | (value as u32 & 0x3f);
         self.w
     }
 }
@@ -129,4 +201,30 @@ impl W {
     pub fn div(&mut self) -> DIV_W {
         DIV_W { w: self }
     }
+    #[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 = "AON Clock Configuration Register\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 [lfrosccfg](index.html) module"]
+pub struct LFROSCCFG_SPEC;
+impl crate::RegisterSpec for LFROSCCFG_SPEC {
+    type Ux = u32;
+}
+#[doc = "`read()` method returns [lfrosccfg::R](R) reader structure"]
+impl crate::Readable for LFROSCCFG_SPEC {
+    type Reader = R;
+}
+#[doc = "`write(|w| ..)` method takes [lfrosccfg::W](W) writer structure"]
+impl crate::Writable for LFROSCCFG_SPEC {
+    type Writer = W;
+}
+#[doc = "`reset()` method sets lfrosccfg to value 0"]
+impl crate::Resettable for LFROSCCFG_SPEC {
+    #[inline(always)]
+    fn reset_value() -> Self::Ux {
+        0
+    }
 }

src/common/backup.rs

@@ -1,18 +1,11 @@
 #[doc = r"Register block"]
 #[repr(C)]
 pub struct RegisterBlock {
-    _reserved0: [u8; 128usize],
-    #[doc = "0x80 - Backup Register"]
-    pub backup: [BACKUP; 16],
+    _reserved0: [u8; 0x80],
+    #[doc = "0x80..0xc0 - Backup Register"]
+    pub backup: [crate::Reg<backup::BACKUP_SPEC>; 16],
 }
-#[doc = "Backup Register\n\nThis register you can [`read`](crate::generic::Reg::read), [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`write_with_zero`](crate::generic::Reg::write_with_zero), [`modify`](crate::generic::Reg::modify). See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [backup](backup) module"]
-pub type BACKUP = crate::Reg<u32, _BACKUP>;
-#[allow(missing_docs)]
-#[doc(hidden)]
-pub struct _BACKUP;
-#[doc = "`read()` method returns [backup::R](backup::R) reader structure"]
-impl crate::Readable for BACKUP {}
-#[doc = "`write(|w| ..)` method takes [backup::W](backup::W) writer structure"]
-impl crate::Writable for BACKUP {}
+#[doc = "backup register accessor: an alias for `Reg<BACKUP_SPEC>`"]
+pub type BACKUP = crate::Reg<backup::BACKUP_SPEC>;
 #[doc = "Backup Register"]
 pub mod backup;

src/common/backup/backup.rs

@@ -1,15 +1,65 @@
-#[doc = "Reader of register backup[%s]"]
-pub type R = crate::R<u32, super::BACKUP>;
-#[doc = "Writer for register backup[%s]"]
-pub type W = crate::W<u32, super::BACKUP>;
-#[doc = "Register backup[%s]
-`reset()`'s with value 0"]
-impl crate::ResetValue for super::BACKUP {
-    type Type = u32;
-    #[inline(always)]
-    fn reset_value() -> Self::Type {
+#[doc = "Register `backup[%s]` reader"]
+pub struct R(crate::R<BACKUP_SPEC>);
+impl core::ops::Deref for R {
+    type Target = crate::R<BACKUP_SPEC>;
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl From<crate::R<BACKUP_SPEC>> for R {
+    #[inline(always)]
+    fn from(reader: crate::R<BACKUP_SPEC>) -> Self {
+        R(reader)
+    }
+}
+#[doc = "Register `backup[%s]` writer"]
+pub struct W(crate::W<BACKUP_SPEC>);
+impl core::ops::Deref for W {
+    type Target = crate::W<BACKUP_SPEC>;
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl core::ops::DerefMut for W {
+    #[inline(always)]
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+impl From<crate::W<BACKUP_SPEC>> for W {
+    #[inline(always)]
+    fn from(writer: crate::W<BACKUP_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 = "Backup Register\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 [backup](index.html) module"]
+pub struct BACKUP_SPEC;
+impl crate::RegisterSpec for BACKUP_SPEC {
+    type Ux = u32;
+}
+#[doc = "`read()` method returns [backup::R](R) reader structure"]
+impl crate::Readable for BACKUP_SPEC {
+    type Reader = R;
+}
+#[doc = "`write(|w| ..)` method takes [backup::W](W) writer structure"]
+impl crate::Writable for BACKUP_SPEC {
+    type Writer = W;
+}
+#[doc = "`reset()` method sets backup[%s]
+to value 0"]
+impl crate::Resettable for BACKUP_SPEC {
+    #[inline(always)]
+    fn reset_value() -> Self::Ux {
         0
     }
 }
-impl R {}
-impl W {}